Fix select reset bugs