Allow underscores in template marker