Avoid Repeat Tags

With a trigger, you could potentially add the same tag over and over. Seems like this should be caught by the OS, but anyway.

Only the last two commits are new. The other two are in the current release already.