Fixes to Tag enable/disable and better Tag reporting queries