removed entity errors when null queries, replaced with null result