small fix, conflicts resolved
Merge remote-tracking branch 'origin/search_remake' into search_remake