Refactored ComboSearch

Refactored ComboSearch class to reduce repetitive code as an attempt in
following good design principles.