remove return_url changes and handle it on submit button