Fix Exception when cleaning up. Support for web components tag names