diff --git a/seo_ui.module b/seo_ui.module
index aa245fd..f58b79a 100644
--- a/seo_ui.module
+++ b/seo_ui.module
@@ -183,10 +183,10 @@ function _seo_ui_alter_metatags(&$form, $form_state, $form_id) {
       }
 
       // Move the Available Tokens fieldset into the main SEO vertical tab.
-      $form['seo_vtab']['token_group'] = $form['metatags']['token_group'];
+      $form['seo_vtab']['token_group'] = $form['metatags']['tokens'];
       // sink it to the bottom
       $form['seo_vtab']['token_group']['#weight'] = 100;
-      unset($form['metatags']['token_group']);
+      unset($form['metatags']['tokens']);
 
       // Move the form.
       $form['seo_vtab']['metatags'] = $form['metatags'];
@@ -226,10 +226,12 @@ function _seo_ui_fix_metatag_descriptions(&$element, $link){
   foreach (element_children($element) as $key) {
     if(!stristr($key, '#')){
       // If this is the advanced part of the metatag form drill down recursively.
-      if($key == 'advanced'){
+      if(!isset($element[$key]['value'])){
         _seo_ui_fix_metatag_descriptions($element[$key], $link);
       }
-      $element[$key]['value']['#description'] =  $element[$key]['value']['#description'] . ' ' . t('Override this !default_settings. ', array('!default_settings' => l('default setting', $link)));
+      else {
+        $element[$key]['value']['#description'] =  $element[$key]['value']['#description'] . ' ' . t('Override this !default_settings. ', array('!default_settings' => l('default setting', $link)));
+      }
     }
   }
 }