Not sure whether items like "sun rise" are considered weather_query too

edit

Utterance:

1. when does the sun rise in beijing
2. when will the sun rise in los angeles tomorrow

Annotation Proposed:

1. knowledge:display -- [when does the sun rise in Beijing]<searchphrase>
2. weather:get -- when will the [sun rise]<weatherquery> in [los angeles]<city> [tomorrow]<date>

Question: We were wondering whether to treat items like "sun rise" in different scenarios as weather_query considering the time of sunrise and sun set are common weather query items in weather reports today. For No.1 we believe the user wants more than explicit sunrise time for like tomorrow, but a factual answer about the topic, so we choose knowledge domain since it fits more. For No.2 we choose weather considering sun rise a weather query item.

Kindly tell us your thought on this :D