Move selectors to config
Change service to return flat list