Fixed search binders after re-factor.