Added a check for a null/empty search string in the SearchExtension.