ADD: fixing up search