Search module update
Merge pull request #815 from sexnothing/develop

Search module update