WIKI-422 Correct result search behavior like 3.5