Update geo-query implementation