Add city to filter forms and move them back to maps app.