fix(search): verify if search is deleted before use it (refs #4416)
fix(search): refactor search list composition (refs #4424)
Merge pull request #1056 from Eric-Brison/3.1-I4416

fix(search): correct search list in generic (closes #4416, #4424)