[Code Style] mod_search : Various changes
Merge pull request #4608 from marcodings/mod_search

[Code Style] mod_search : Various changes