Add support for numbers in tag names