Fix bug 2969
Fix tagging (post workshop)