Improved geocoding behaviour in forms