Added default options for queries