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