Expand tags for categories
Merge branch 'kyle-cleanup'