--- boost.module	Tue May 26 12:44:01 2009
+++ boost.module	Wed May 27 03:36:02 2009
@@ -61,18 +61,16 @@
  * Implementation of hook_init(). Performs page setup tasks if page not cached.
  */
 function boost_init() {
+  global $user, $base_path;
   // Make the proper filename for our query
-  $fname = '';
+  $query = '';
   foreach ($_GET as $key => $val) {
     if ($key != 'q') {
-      $fname .= (empty($fname) ? '' : '&') . $key . '=' . $val;
+      $query .= (empty($query) ? '' : '&') . $key . '=' . $val;
     }
   }
-  //set variables
-  global $user, $base_path;
-  $GLOBALS['_boost_query'] = (empty($fname) ? '' : '_' . $fname);
-  $GLOBALS['_boost_path'] = (empty($_REQUEST['q'])) ? 'index' : $_REQUEST['q'];
-  $GLOBALS['_boost_path'] = ($base_path != '/') ? ltrim($base_path, '/') . $GLOBALS['_boost_path'] : $GLOBALS['_boost_path'];
+  //set path variable
+  $GLOBALS['_boost_path'] = (($base_path != '/') ? ltrim($base_path, '/') . $_REQUEST['q'] : $_REQUEST['q']) . '_' . $query;
   
   // Make sure the page is/should be cached according to our current configuration
   if (   strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') === FALSE 
@@ -585,12 +583,6 @@
  * Returns the static file path for a Drupal page.
  */
 function boost_file_path($path) {
-  // special handling for Drupal's front page no more needed - already done on the input
-
-  if ($GLOBALS['_boost_query']) {
-    $path .= $GLOBALS['_boost_query'];
-  }
-
   // Under no circumstances should the incoming path contain '..' or null
   // bytes; we also limit the maximum directory nesting depth of the path
   if (strpos($path, '..') !== FALSE || strpos($path, "\0") !== FALSE ||