diff --git a/core/util.inc.php b/core/util.inc.php
index 21c3816e..b0343650 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -398,9 +398,9 @@ function _get_query_parts() {
 		$n++;
 	}
 	*/
-	$path = str_replace('/', ' ', $path);
-	$path = str_replace('  ', '/', $path);
-	$parts = split(' ', $path);
+	$path = str_replace('/', '%%', $path);
+	$path = str_replace('%%%%', '/', $path);
+	$parts = split('%%', $path);
 
 	return $parts;
 }