diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 7c1cd8551d..1110f63ce8 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -152,14 +152,15 @@ if ( 'grid' === $mode ) {
 		0
 	);
 
-	$q = $_GET;
+	$query_string = $_GET;
 	// Let JS handle this.
-	unset( $q['s'] );
-	$vars   = wp_edit_attachments_query_vars( $q );
-	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
-	foreach ( $vars as $key => $value ) {
+	unset( $query_string['s'] );
+	$query_vars = wp_edit_attachments_query_vars( $query_string );
+	$ignore     = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
+
+	foreach ( $query_vars as $key => $value ) {
 		if ( ! $value || in_array( $key, $ignore, true ) ) {
-			unset( $vars[ $key ] );
+			unset( $query_vars[ $key ] );
 		}
 	}
 
@@ -168,7 +169,7 @@ if ( 'grid' === $mode ) {
 		'_wpMediaGridSettings',
 		array(
 			'adminUrl'  => parse_url( self_admin_url(), PHP_URL_PATH ),
-			'queryVars' => (object) $vars,
+			'queryVars' => (object) $query_vars,
 		)
 	);
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d5eb29384d..12e39334ba 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60966';
+$wp_version = '6.9-alpha-60967';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.