removed over cautious null checks from other query descriptors similar to #262, passing null is not an error