DDF-772 Fixed default query