BUGFIX: currently selected entity in selector not disappearing when next entity is selected