Query Map on location corrected