CustomTag improvements