Fix geo queries