Search update mergefix

Fixes #3443 merge conflict 

cc: @aaronschachter