Fix: escaping
Refactor: move this into config