diff --git hansel_og.module-- hansel_og.module
index 55b470a..3126569 100755
--- hansel_og.module--
+++ hansel_og.module
@@ -29,22 +29,25 @@ function hansel_og_action_add_og_path_get_crumbs($arguments) {
   $links = array();
 
   if ((hansel_arg(0) == 'node') && (is_numeric(hansel_arg(1)))) {
-    if ($node = og_get_group_context()) {
-      if (in_array($node->type, $arguments['group'])) {
-        if ($arguments['type']) {
-          // Add the type of group in the breadcrumb
-          $links[] = array(
-            'title' => drupal_ucfirst($node->type),
-            'href' => $arguments['path_' . $node->type],
-          );
-        }
-
+    if ($group = og_context()) {
+//      if (in_array($node->type, $arguments['group'])) {
+//        if ($arguments['type']) {
+//          // Add the type of group in the breadcrumb
+//          $links[] = array(
+//            'title' => drupal_ucfirst($node->type),
+//            'href' => $arguments['path_' . $node->type],
+//          );
+//        }
+		$entity_from_group = $group->getEntity();
+	    $url = entity_uri($group->entity_type, $entity_from_group);
+//	    var_dump($url);
+	    
         // Add group name to breadcrumb
         $links[] = array(
-          'title' => $node->title,
-          'href' => $node->path,
+          'title' => $group->label,
+          'href' => $url['path'],
         );
-      }
+//      }
     }
   }
 
@@ -83,12 +86,14 @@ function hansel_og_action_add_og_path_config_form($arguments) {
   $form = array();
 
   $options = array();
-  foreach (node_type_get_types() as $name => $type) {
-    $type_url_str = str_replace('_', '-', $type->type);
-    $usage = variable_get('og_content_type_usage_' . $type->type, 'omitted');
-    if ($usage == 'group') {
-      $options[$name] = drupal_ucfirst($type->name);
-    }
+  foreach (entity_get_info() as $entity_type => $entity_value) {
+	if (!empty($entity_value['fieldable'])) {
+	    foreach ($entity_value['bundles'] as $bundle => $bundle_value) {
+	      if (og_is_group_type($entity_type, $bundle)) {
+	        $options[$bundle] = check_plain($bundle_value['label']);
+	      }
+	    }
+	}
   }
 
   $form['group'] = array(
@@ -97,7 +102,7 @@ function hansel_og_action_add_og_path_config_form($arguments) {
     '#options' => $options,
     '#description' => t('Use only for these groups. This only applies when this is a group type.'),
     '#default_value' => isset($arguments['group']) ? $arguments['group'] : array(),
-    '#required' => TRUE,
+    '#required' => FALSE,
     '#attributes' => array('class' => 'hansel-og-checkboxes'),
   );