Make stop selections work on updates and rerendering after validation errors.

Update needs more work on stop selections