Updating option URL to be an optional query