Add regex constraint to option names for #366