Refactored the Header Controller and fixed search issue
Merge pull request #168 from prabinv/30002_RefacrtorHeaderCtrl

Refactored the Header Controller and fixed search issue