Map Query fixed