Store more data in City model to optimize queries