diff --git a/mod/directory.php b/mod/directory.php
index c2a71b680..d6dc8627c 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -216,7 +216,7 @@ function directory_content(&$a) {
 					}
 					else {
 
-						$o .= "<script> var page_query = '" . $a->query_string . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+						$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
 						$o .= replace_macros($tpl, array(
 							'$search' => $search,
 							'$desc' => t('Find'),
diff --git a/mod/photos.php b/mod/photos.php
index 3bc105ba1..5618ae4e6 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -730,7 +730,7 @@ function photos_content(&$a) {
 				      $rel=("photo");
 //				}
       
-				$o .= "<script> var page_query = '" . $a->query_string . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+				$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
 
 				$tmp = replace_macros($tpl,array(
 					'$id' => $rr['id'],
@@ -1223,7 +1223,7 @@ function photos_content(&$a) {
 		killme();
 	}
 	else {
-		$o .= "<script> var page_query = '" . $a->query_string . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+		$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
 		$tpl = get_markup_template('photos_recent.tpl'); 
 		$o .= replace_macros($tpl, array(
 			'$title' => t('Recent Photos'),