NEON-1065 Tweaking some of the queries for the map data.