fixed EntityQuery return type