Fixed sanitization in Matt's frontend