Refactor weather searches to use utc and be more reliable based on type