Finish switch to new tag system
merge.