Issue #84: Priority 1: 'Search' malfunctions