Add regex to tag extraction