some small reorg based on new tag api
some small reorg based on new tag api

SuperCowPowers/workbench,djtotten/workbench,SuperCowPowers/workbench,djtotten/workbench,SuperCowPowers/workbench,djtotten/workbench