Fix submitted select value not persisting in submit