SearchFix - Fixes #4497
Merge pull request #4522 from ChuckTheSheep/Search-Fix

SearchFix - Fixes #4497