diff --git a/handlers/location_handler_field_location_address.inc b/handlers/location_handler_field_location_address.inc
index 0873c20..bae7dbe 100644
--- a/handlers/location_handler_field_location_address.inc
+++ b/handlers/location_handler_field_location_address.inc
@@ -14,6 +14,7 @@ class location_handler_field_location_address extends views_handler_field {
   public function option_definition() {
     $options = parent::option_definition();
     $options['hide'] = array('default' => array());
+    $options['exclude_cck'] = array('default' => FALSE);
 
     return $options;
   }
@@ -29,6 +30,21 @@ class location_handler_field_location_address extends views_handler_field {
       '#options' => location_field_names(TRUE),
       '#default_value' => $this->options['hide'],
     );
+    $form['exclude_cck'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Exclude Content locations'),
+      '#description' => t('Filter Content (CCK) locations from this field. You can use Content views fields to display them seperately.'),
+      '#default_value' => $this->options['exclude_cck'],
+    );
+  }
+
+  function query() {
+    if (empty($this->options['exclude_cck'])) {
+      parent::query();
+      return;
+    }
+    $genid_field = $this->query->ensure_table('location_instance', $this->relationship) . ".genid";
+    $this->query->add_where(0, "$genid_field NOT LIKE '%cck%' OR $genid_field IS NULL");
   }
 
   /**