diff --git a/boot.php b/boot.php
index c9d3045cad..3bf85b14f4 100644
--- a/boot.php
+++ b/boot.php
@@ -699,10 +699,10 @@ class App {
 			// removing trailing / - maybe a nginx problem
 			$this->query_string = lrim($this->query_string, '/');
 		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
-			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
+			$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
 
 			// removing trailing / - maybe a nginx problem
-			$this->query_string = lrim($this->query_string, '/');
+			$this->query_string = ltrim($this->query_string, '/');
 		}
 
 		if (x($_GET, 'pagename')) {