Better geolocation alignment