Fix inconsistencies in the replacement of "search" with "search2"

Stephanrequested to merge
github/fork/yngwi/search2-bugfix into master

Created by: yngwi

Merge request reports