Fix entity.name.tag regex pattern to match tags containing hyphens