fixes. making search overridable.