Modify to return empty ObjectList in place of null as a query result