Updating to address weirdness with tags