Added options to query object

Change-Id: Ic045ff797093257f200fbbd1c85566374ea8e341
Merge "Added options to query object"