PDIO-224 Fix API queries with geo and add tests