Moved Location Fallback to session helper