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

Search module update