Resolved issue: 647

 CriteriaQuery don't support "$type"
You don't need to do any of this, you can simply use `getDs()` from the superclass instead.