refactor to fix bug around not unselecting after back button