changes in searching
refactor searching changes