Fix for empty searches