Modified state routing, fixed on select ui behavior