Fixing geo query