Index: addresses_cck/addresses_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses_cck/addresses_cck.module,v
retrieving revision 1.16
diff -u -p -r1.16 addresses_cck.module
--- addresses_cck/addresses_cck.module	11 Dec 2008 18:20:24 -0000	1.16
+++ addresses_cck/addresses_cck.module	20 Apr 2009 15:32:31 -0000
@@ -174,8 +174,10 @@ function addresses_cck_field_settings($o
         $field_cck = $cck_default;
         $field_cck['title'] .= ' '. $field_data['title'];
         $field_cck['field']['field'] = $field['field_name'] .'_'. $ftype;
-        $field_cck['filter']['title'] .= ' '. $field_data['title'];
+        $field_cck['title short'] .= ' - '. $field_data['title'];
 
+        unset($field_cck['field']['title']);
+        unset($field_cck['field']['title short']);
 //         unset($field_cck['field']['additional fields']);
         $data[$table_alias][$field['field_name'] .'_'. $ftype] = $field_cck;
       }