diff --git a/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java b/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
index 59f15a486..a5220a99d 100644
--- a/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
+++ b/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
@@ -81,6 +81,7 @@
 import com.introproventures.graphql.jpa.query.schema.impl.EntityIntrospector.EntityIntrospectionResult.AttributePropertyDescriptor;
 import com.introproventures.graphql.jpa.query.schema.impl.PredicateFilter.Criteria;
 import com.introproventures.graphql.jpa.query.support.GraphQLSupport;
+
 import graphql.GraphQLException;
 import graphql.execution.MergedField;
 import graphql.execution.ValuesResolver;
@@ -419,7 +420,8 @@ protected TypedQuery<Object[]> getBatchQuery(DataFetchingEnvironment environment
         );
 
         // optionally add default ordering
-        mayBeAddDefaultOrderBy(query, join, cb);
+        // FIXME need to extract correct id attribute from collection entity
+        // mayBeAddDefaultOrderBy(query, join, cb);
 
         return entityManager.createQuery(query.distinct(isDistinct));
     }
@@ -1576,7 +1578,7 @@ else if (FloatValue.class.isInstance(value)) {
             return (T) FloatValue.class.cast(value).getValue();
         }
         else if (NullValue.class.isInstance(value)) {
-            return (T) null;
+            return null;
         }
 
         throw new IllegalArgumentException("Not supported");
diff --git a/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactoryTest.java b/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactoryTest.java
index e910369df..623c70525 100644
--- a/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactoryTest.java
+++ b/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactoryTest.java
@@ -198,7 +198,7 @@ public void testInstrumentationDisabled() {
         ExecutionResult result = executor.execute(query);
 
         // then
-        assertThat(result.getExtensions()).isNull();
+        assertThat(result.getExtensions().get("tracing")).isNull();
     }
     
 }