Rework pubsub.
Merge branch 'ui'
Tag shouldn't be added if it already exists.