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