Simplify tag assignment

which reordered the tags as well :/