Update the remaining tags