better tag management: small refactoring + debug tag removal #5 #17