Tagging: Add initial infrastructure

Fixes bug 3034
Tagging: Add tags for TPs

Fixes bug 3035