Update tags

Also sorted.

Change-Id: I6bce2b5288a356b0baa2ec01ce732ca43a02ee34