Index: addresses_cck/addresses_cck.module
===================================================================
--- addresses_cck/addresses_cck.module	(revision 617)
+++ addresses_cck/addresses_cck.module	(working copy)
@@ -178,8 +178,13 @@ function addresses_cck_field_settings($op, $field)
           $field_cck['title'] .= ' '. $field_data['title'];
         }
         $field_cck['field']['field'] = $field['field_name'] .'_'. $ftype;
-        $field_cck['filter']['title'] .= ' '. $field_data['title'];

+        // Adding in the field to the filter array
+        $field_cck['filter']['field'] = $field['field_name'] .'_'. $ftype;
+
+        // Tweaked to include the short title to distinguish multiple addresses in the same node when picking filters.
+        $field_cck['filter']['title'] = $cck_default['title short'] . ': ' . $field_cck['filter']['title'] . ' '. $field_data['title'];
+
 //         unset($field_cck['field']['additional fields']);
         $data[$table_alias][$field['field_name'] .'_'. $ftype] = $field_cck;
       }