added custom tag handling