[BUGFIX] Escape more fields