Refactor Tags using queries'
Adjust specs for recent changes and refactor tags for collaboration scoping