Added escape functionality to query/query-string