more TagService cleanup