fixing data graph quering for class-level queries