Moved to query string inputs with optional fallbacks