Quote all parameters in filter query

Change-Id: I4ec023ebf075b36b5db6261ea92fa1e605a98874
Merge "Quote all parameters in filter query"