Added a do while loop for querying larger areas