Add a location.query map without breaking a sweat