Tag accounting controls

Improvement of accounting control measures