--- faceted_search/faceted_search_ui.module	2008-10-17 14:46:58.000000000 -0400
+++ ../../faceted_search_ui.module	2008-10-17 15:30:38.000000000 -0400
@@ -23,6 +23,15 @@
 }
 
 /**
+ * Implementation of hook_forms().
+ */
+function faceted_search_ui_forms() {
+  $forms = array();
+  foreach (faceted_search_get_env_ids() as $env_id) $forms["faceted_search_ui_form_{$env_id}"]['callback'] = 'faceted_search_ui_form';
+  return $forms;
+}
+
+/**
  * Implementation of hook_menu().
  */
 function faceted_search_ui_menu($may_cache) {
@@ -527,7 +535,7 @@
  * Display the keyword search form.
  */
 function faceted_search_ui_keyword_block($search) {
-  return drupal_get_form('faceted_search_ui_form', $search);
+  return drupal_get_form("faceted_search_ui_form_{$search->get_env_id()}", $search);
 }
 
 /**
@@ -691,7 +699,7 @@
 }
 
 /**
- * Render the search form.
+ * Render the base search form.
  */
 function faceted_search_ui_form($search) {
   $ui_state = $search->ui_state;
@@ -840,7 +847,7 @@
     $path = faceted_search_ui_build_path($search->get_env_id(), $ui_state, $search->get_text());
     $form['go-select']['#value'] = l(t('More options'), $path);
   }
-
+  $form['#submit'] = array('faceted_search_ui_form_submit' => array());
   return $form;
 }