PAHMA-1136: Revise part17.sql (the geoloc query)