More work on Selector Admin