Removed parameters with default values from URL
Added commented-out scenarios to be reinstated later