[CLEANUP] Improved tagController