Only send 1 query to map on load

Only send a single query to the map when things are loaded instead of 2.
fixes #519