Include support for dashes in tag names