diff --git a/cer.admin.inc b/cer.admin.inc
index e290698..5c23ea8 100644
--- a/cer.admin.inc
+++ b/cer.admin.inc
@@ -13,22 +13,26 @@ function cer_settings_form() {
   $result = db_query("SELECT field_name, data FROM {field_config} WHERE type = :type AND deleted = 0", array(':type' => 'entityreference'));
   foreach ($result as $row) {
     $data = unserialize($row->data);
-    if(empty($data['settings']['handler_settings']['target_bundles'])){
-      	$references[$row->field_name][] = $data['settings']['target_type'];
+
+    if ($data['settings']['handler'] == 'views') {
+      $references[$row->field_name][] = 'views:' . $data['settings']['handler_settings']['view']['view_name'] . ':' . $data['settings']['handler_settings']['view']['display_name'];
     }
-    if(isset($data['settings']['handler_settings']['target_bundles'])){
-      foreach ($data['settings']['handler_settings']['target_bundles'] as $reference) {
-        if ($reference != '0') {
-          $references[$row->field_name][] = $reference;
+    else {
+      if (empty($data['settings']['handler_settings']['target_bundles'])){
+          $references[$row->field_name][] = $data['settings']['target_type'];
+      }
+      if (isset($data['settings']['handler_settings']['target_bundles'])){
+        foreach ($data['settings']['handler_settings']['target_bundles'] as $reference) {
+          if ($reference != '0') {
+            $references[$row->field_name][] = $reference;
+          }
         }
       }
     }
   }
 
   $result = db_query("SELECT fci.field_name, fci.entity_type, fci.bundle FROM {field_config_instance} fci INNER JOIN {field_config} fc ON fc.field_name = fci.field_name WHERE fc.type = :type", array(':type' => 'entityreference'));
-
   foreach ($result as $row) {
-
     if (!empty($references[$row->field_name])) {
       foreach ($references[$row->field_name] as $reference) {
           $fields_to_compare[] = array('field_type' => $row->field_name, 'bundle' => $row->bundle, 'reference' => $reference, 'entity' => $row->entity_type);
@@ -40,7 +44,10 @@ function cer_settings_form() {
     $corr_entityrefs = array();
     foreach ($fields_to_compare as $field) {
       foreach ($fields_to_compare as $second_field) {
-        if ($field['bundle'] == $second_field['reference'] && $second_field['bundle'] == $field['reference']) {
+        $field_is_views = strpos($field['reference'], 'views:') === 0;
+        $second_field_is_views = strpos($second_field['reference'], 'views:') === 0;
+
+        if ($field_is_views || $second_field_is_views || ($field['bundle'] == $second_field['reference'] && $second_field['bundle'] == $field['reference'])) {
           if (!array_key_exists($field['entity'] . ' ' . $field['bundle'] . ' ' . $field['field_type'] . ' ' .
                          $second_field['entity'] . ' ' . $second_field['bundle'] . ' ' . $second_field['field_type'], $corr_entityrefs)
            && !array_key_exists($second_field['entity'] . ' ' . $second_field['bundle'] . ' ' . $second_field['field_type'] . ' ' . $field['entity'] . ' ' . $field['bundle'] . ' ' . $field['field_type'], $corr_entityrefs)) {