allow ids beginning with underscore / dash

regex enhancement