      {
          return $this->_allowedall;
      }
+@@ -659,7 +658,6 @@
+         }
+         
+         $fieldname = $this->_config->getString('entity.prettyname', NULL);
+-
+         $default = $this->_config->getArray('metadatafields.' . $this->_type);
+ 
+         if(!is_null($fieldname)) {
+@@ -678,7 +676,7 @@
+ 
+             if(empty($rows)) {
+                 $this->_prettyname =  $this->_entityid;
+-            } else if($default[$fieldname]['default'] == $rows[0]['value']) {
++            } else if(isset($defatul[$fieldname]['default']) && $default[$fieldname]['default'] == $rows[0]['value']) {
+                 $this->_prettyname =  $this->_entityid; 
+             } else {
+                 $this->_prettyname = $rows[0]['value'];
 Index: lib/EntityController.php
 ===================================================================
 --- lib/EntityController.php	(revision 484)

                 $update = true;
             }
         }
@@ -831,13 +855,72 @@
     {
         assert('is_string($remoteentityid)');
 

+    if(isset($_POST['addBlocked'])) {
         $mcontroller->setAllowedAll('no');
-        foreach($_POST['add'] AS $key) {
+        $current = array_keys($mcontroller->getBlockedEntities());
+        // Add the ones that are selected
+        foreach($_POST['addBlocked'] AS $key) {
             if($mcontroller->addBlockedEntity($key)) {
                 $update = TRUE;
                 $note .= 'Remote entity added: ' . $key . '<br />';
             }
         }
+        // Remove the ones that were, but are now no longer selected
+        foreach($current as $entityid) {
+            if (!in_array($entityid, $_POST['addBlocked'])) {
+                if ($mcontroller->removeBlockedEntity($entityid)) {
+                    $update = TRUE;
+                    $node .= 'Existing entity removed: '. $entityid . '<br/>';
+                }
+            }
+        }
+        
+    } else if (count($mcontroller->getBlockedEntities())) {
+        // There were blocked entities but they were no longer posted; we should clear them all
+        $mcontroller->clearBlockedEntities();
