Fix weather queries with weather at the end.