Search feature fix.