Patches to fix search.