improve autoenhance + allow override of geolocation