3 files changed, 12 insertions, 3 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index a42433b7..fdfd3107 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -384,6 +384,8 @@ void CompletionWidget::suggestUrls(const QString &text)
 
     UrlResolver *res = new UrlResolver(text);
     connect(res, SIGNAL(suggestionsReady(const UrlSearchList &, const QString &)), this, SLOT(updateSearchList(const UrlSearchList &, const QString &)));
-    res->computeSuggestions();
     _resList = res->orderedSearchItems();
+
+    // NOTE: It's important to call this AFTER orderedSearchItems() to let everything work
+    res->computeSuggestions();
 }
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index c95557cf..57d6ca64 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -412,8 +412,16 @@ void UrlResolver::suggestionsReceived(const QString &text, const ResponseList &s
 
     Q_FOREACH(const Response &i, suggestions)
     {
+        QString urlString = i.url;
+        if(urlString.isEmpty())
+        {
+            QStringList list;
+            list << QL1S("kuriikwsfilter"); 
+            urlString = KUriFilter::self()->filteredUri(i.title, list);  
+        }
         kDebug() << "RESPONSE URL: " << i.url;
-        UrlSearchItem gItem(UrlSearchItem::Suggestion, i.url, i.title, i.description, i.image, i.image_width, i.image_height);
+        
+        UrlSearchItem gItem(UrlSearchItem::Suggestion, urlString, i.title, i.description, i.image, i.image_width, i.image_height);
         sugList << gItem;
     }
     emit suggestionsReady(sugList, _typedString);
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index e21e65e8..b3d1c9ff 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -153,7 +153,6 @@ private:
     UrlSearchItem privilegedItem(UrlSearchList* list);
     UrlSearchList orderLists();
 
-    
     QString _typedString;
 
     UrlSearchList _webSearches;