[Code Style] com_search : Various changes
Merge pull request #4624 from marcodings/com_search

[Code Style] com_search : Various changes