diff --git a/xmlsitemap.admin.inc b/xmlsitemap.admin.inc
index 68e2c3a..8ca0065 100644
--- a/xmlsitemap.admin.inc
+++ b/xmlsitemap.admin.inc
@@ -694,6 +694,10 @@ function xmlsitemap_add_link_bundle_settings(array &$form, array &$form_state, $
   $form += array('#submit' => array());
   array_unshift($form['#submit'], 'xmlsitemap_link_bundle_settings_form_submit');
 
+  if (isset($form['actions']['submit']['#submit'])) {
+    array_unshift($form['actions']['submit']['#submit'], 'xmlsitemap_link_bundle_settings_form_submit');
+  }
+
   if (isset($form['submit'])) {
     $form['submit'] += array('#weight' => 40);
   }
diff --git a/xmlsitemap.generate.inc b/xmlsitemap.generate.inc
index 5d39902..012de7a 100644
--- a/xmlsitemap.generate.inc
+++ b/xmlsitemap.generate.inc
@@ -504,7 +504,7 @@ function xmlsitemap_rebuild_batch_fetch($entity, &$context) {
   $result = $query->execute();
   $ids = array_keys($result[$entity]);
 
-  $info['xmlsitemap']['process callback']($ids);
+  $info['xmlsitemap']['process callback']($ids, array('entity_type' => $entity));
   $context['sandbox']['last_id'] = end($ids);
   $context['sandbox']['progress'] += count($ids);
   $context['message'] = t('Now processing %entity @last_id (@progress of @count).', array(
diff --git a/xmlsitemap.module b/xmlsitemap.module
index f4cff13..12ae21b 100644
--- a/xmlsitemap.module
+++ b/xmlsitemap.module
@@ -1711,7 +1711,7 @@ function xmlsitemap_link_queue_process($data) {
   $info = xmlsitemap_get_link_info($data['type']);
   $ids = isset($data['ids']) ? $data['ids'] : array($data['id']);
   if (function_exists($info['xmlsitemap']['process callback'])) {
-    $info['xmlsitemap']['process callback']($ids);
+    $info['xmlsitemap']['process callback']($ids, array('entity_type' => $entity));
   }
 }