DDF-495 fixed 2 test cases for bad queries