Issue #8560 by cableman: Ensured that search works for all types