done with huge refactoring for the tag handler