added 2 query options