Refactor search
Merge pull request #15 from rastislav-chynoransky/feat-refactor-search-module

Refactor search