Move query service functions to module
Remove irrelevant specs
Remove references to collections index and show