DDF-249 fixed issues with doing queries other than keyword