Resolve #3584678 "Refactor search logic"

Closes #3584678

Merge request reports

Loading