Restore passing selectedEntity, but add filtersWithSelection to decide whether to filter servers based on selection. Partially revert 91a3e42533
91a3e42533
Do some renaming too.