[#41] moved searching logic to model, refactored it, created more tests for search method