Tag-enchancements fixes (refactoring)