fixed find/search