Added limit on map query