[FIX] Escaping in badge editor
[FIX] OAuth display tokens ts format

- Closes #1432