EntityQuery.toJson and ctor changes