Merge pull request #26 from k-joseph/CSM-66

[#CSM- 66] Refactor Chart Search Module's code