Fix
Fix comments
Activate alert-tags again