added support for dash in tag names