fix: XSS protection
fix: Remove workaround for showing messages
Optimization