some optimizations after tag consolidation, removal of DrupalNodeTag code publiclab/plots2#93
more optimizations/fixes for publiclab/plots2#93