WAVE-311 Refactors some search related code.
4 files changed