diff --git a/knetattach/knetattach.cpp b/knetattach/knetattach.cpp
index 5808b7c6..0974e2da 100644
--- a/knetattach/knetattach.cpp
+++ b/knetattach/knetattach.cpp
@@ -216,7 +216,7 @@ bool KNetAttach::validateCurrentPage()
             desktopFile.writeEntry("Name", name);
             desktopFile.writeEntry("Type", "Link");
             desktopFile.writeEntry("URL", remoteUrl);
-            desktopFile.writeEntry("Charset", url.fileEncoding());
+            desktopFile.writeEntry("Charset", url.queryItemValue("charset"));
             desktopFile.sync();
             org::kde::KDirNotify::emitFilesAdded( "remote:/" );
         }
diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp
index e174c0fd..8bb7bd8c 100644
--- a/kurifilter-plugins/tests/kurifiltertest.cpp
+++ b/kurifilter-plugins/tests/kurifiltertest.cpp
@@ -65,7 +65,7 @@ static void filter( const char* u, const char * expectedResult = 0, int expected
         QString cmd;
         KUrl uri = filterData->uri();
 
-        if ( uri.isLocalFile() && !uri.hasRef() && uri.query().isEmpty() &&
+        if ( uri.isLocalFile() && !uri.hasFragment() && !uri.hasQuery() &&
              (filterData->uriType() != KUriFilterData::NetProtocol))
             cmd = uri.toLocalFile();
         else