[sprint 36] friendly search + encapsulating the search into a new class
[sprint 36] friendly search finished