fix(Query/granuality): if object specified just return it
Merge remote-tracking branch 'origin/master'