enhance on change selected state handler 2