Minor improvement of the weather query support