Merge pull request #12 from harvard-lil/develop

Develop
Merge pull request #13 from harvard-lil/develop

Develop
Escape only query characters.