Bug fixes in case state is blank on submit
Fixed return url field