impr(engine): null checks in JobDef query

related to #CAM-1459