Cleaned up fallback URL behavior