Index: drupalorg_search/drupalorg_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalorg/drupalorg_search/drupalorg_search.module,v
retrieving revision 1.22
diff -u -p -r1.22 drupalorg_search.module
--- drupalorg_search/drupalorg_search.module	10 Aug 2010 22:31:48 -0000	1.22
+++ drupalorg_search/drupalorg_search.module	11 Aug 2010 21:51:17 -0000
@@ -216,7 +216,7 @@ function drupalorg_search_block_view($de
         }
         return array(
           'subject' => t('Browse @project_type', array('@project_type' => $project_type_term->name)),
-          'content' => drupal_get_form('project_solr_browse_projects_form', $project_type_term, 'search/apachesolr_search/' . arg(2)),
+          'content' => drupal_get_form('project_solr_browse_projects_form', $project_type_term, 'search/apachesolr_search/' . $query->get_keys()),
         );
       }
       break;
@@ -280,10 +280,11 @@ function drupalorg_search_form_project_s
   if (arg(0) == 'search' && arg(1) == 'apachesolr_search') {
     $form['#submit'][] = 'drupalorg_search_project_solr_browse_project_form_submit';
 
-    // We default the text to our url value so that we don't get errors
-    // when attempting to sort by relevancy. Make the access false, so that
-    // the values aren't visible and we don't have 2 search forms.
-    $form['text']['#default_value'] = arg(2);
+    // We default the text to our current search terms so that we don't get 
+    // errors when attempting to sort by relevancy. We make the access false, 
+    // so that the values aren't visible and we don't have 2 search forms.
+    $query = apachesolr_current_query();
+    $form['text']['#default_value'] = $query->get_keys();
     $form['text']['#access'] = FALSE;
   }
 }