Escape more fields.
Merge pull request #16 from Kampfgnom/mpmbase

Escape more fields.