Add CJ's city scoping changes for pairs api and weather.