Get rid of 3rd party partial_search