Improved handling of fallback URL