Rework tagging system to support compound tags