Escape values
Merge pull request #52 from RWOverdijk/hotfix/indexes

Escape values