refactoring (moving logic to the AngularTagDecorator) - work in progress