fixed selection moving on view udates