Refactored entityQuery stuff out of BaseModelObject and into dao.