diff -ruN -x .git /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.index.inc ../apachesolr_multisitesearch/apachesolr_multisitesearch.index.inc
--- /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.index.inc	2012-03-15 12:01:11.000000000 +0100
+++ ../apachesolr_multisitesearch/apachesolr_multisitesearch.index.inc	2012-03-15 12:02:35.000000000 +0100
@@ -37,10 +37,12 @@
   $env_id = apachesolr_default_environment();
 
   // Add bundle information to our metadata
-  // We index each name as a string for cross-site faceting
-  foreach (content_types() as $bundle => $bundle_info) {
-    if (!empty($bundle_info['extra']['apachesolr']['index'])) {
-      $document->setMultiValue('sm_multisite_meta_bundles', $bundle_info['name']);
+  foreach (entity_get_info() as $entity_type => $info) {
+    // We index each name as a string for cross-site faceting
+    foreach ($info['bundles'] as $bundle => $bundle_info) {
+      if (!empty($bundle_info['apachesolr']['index'])) {
+        $document->setMultiValue('sm_multisite_meta_bundles', $bundle_info['label']);
+      }
     }
   }
 
diff -ruN -x .git /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.info ../apachesolr_multisitesearch/apachesolr_multisitesearch.info
--- /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.info	2012-03-13 12:15:04.000000000 +0100
+++ ../apachesolr_multisitesearch/apachesolr_multisitesearch.info	2012-03-13 12:08:19.000000000 +0100
@@ -3,4 +3,4 @@
 dependencies[] = apachesolr
 dependencies[] = apachesolr_search
 package = Search Toolkit
-core = "6.x"
\ No newline at end of file
+core = "7.x"
\ No newline at end of file
diff -ruN -x .git /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.module ../apachesolr_multisitesearch/apachesolr_multisitesearch.module
--- /Users/nickveenhof/Sites/dev/docs.acquia.com/site/sites/all/modules/contrib/apachesolr_multisitesearch/apachesolr_multisitesearch.module	2012-03-15 11:35:34.000000000 +0100
+++ ../apachesolr_multisitesearch/apachesolr_multisitesearch.module	2012-03-15 11:34:37.000000000 +0100
@@ -10,7 +10,7 @@
  */
 function apachesolr_multisitesearch_menu() {
   $items = array();
-  $items['admin/settings/apachesolr/multisite-filters'] = array(
+  $items['admin/config/search/apachesolr/multisite-filters'] = array(
     'title' => 'Multisite',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('apachesolr_multisitesearch_settings'),
@@ -46,16 +46,14 @@
  *
  * Adds a "make multisite" option in the settings of any environment
  */
-function apachesolr_multisitesearch_form_apachesolr_environment_edit_form_alter(&$form, &$form_state) {
-  $environment = $form['#parameters'][2];
+function apachesolr_multisitesearch_form_apachesolr_environment_edit_form_alter(&$form, &$form_state, $form_id) {
+  $environment = reset($form_state['build_info']['args']);
   $is_multisite = apachesolr_environment_variable_get($environment['env_id'], 'multisitesearch');
   $form['make_multisite'] = array(
     '#type' => 'checkbox',
     '#title' => t('Make this Solr search environment multisite capable'),
     '#default_value' => $is_multisite,
-    '#weight' => 1,
   );
-  $form['actions']['#weight'] = 2;
   $form['actions']['save']['#submit'][] = 'apachesolr_multisitesearch_environment_edit_submit';
 }