Fix #86 - Entity objects from a query have a proper Dataset reference