CurrentEmployer and select-list cleanup