diff --git a/all/modules/contrib/addresses/addresses_cck/addresses_cck.module b/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
index 34c3f24..fdbc96b 100755
--- a/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
+++ b/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
@@ -89,7 +89,6 @@ function addresses_cck_field_formatter_info() {
       }
     }
   }
-
   return $formatters;
 }
 
@@ -158,14 +157,23 @@ function addresses_cck_field_settings($op, $field) {
     case 'database columns':
       // Return the table similar to those set on hook_schema.
       // It describes each database field that will be stored.
-      return module_invoke_all('addressesfieldapi', 'fields');
+      $columns = module_invoke_all('addressesfieldapi', 'fields');
+      
+      //Make columns sortable;
+      foreach ($columns as &$column) {
+        $column['sortable'] = TRUE;
+      }
+      return $columns;
 
     case 'views data':
       // Rerebuild the Views integration, since the address field is,
       // in fact, a bundle of fields.
+
       $db_info      = content_database_info($field);
       $table_alias  = content_views_tablename($field);
       $cck_default  = content_views_field_views_data($field);
+      
+      
       $data[$table_alias]['table'] = $cck_default[$table_alias]['table'];
       unset($cck_default[$table_alias]['table']);
 
@@ -176,14 +184,33 @@ function addresses_cck_field_settings($op, $field) {
         $field_cck = $cck_default;
         if (isset($field_data['title'])) {
           $field_cck['title'] .= ' '. $field_data['title'];
+          $field_cck['title short'] = $field_data['title'];          
         }
         $field_cck['field']['field'] = $field['field_name'] .'_'. $ftype;
         $field_cck['filter']['title'] .= ' '. $field_data['title'];
 
 //         unset($field_cck['field']['additional fields']);
         $data[$table_alias][$field['field_name'] .'_'. $ftype] = $field_cck;
+        
+        
+        //Move fields to Addresses Group to make it easier to find them in the Viewws GUI.
+        $data[$table_alias][$field['field_name'] .'_'. $ftype]['group'] = 'Addresses';
+        
+        //Make sortable;
+        $data[$table_alias][$field['field_name'] .'_'. $ftype]['sort'] = array(
+          'field' => $field['field_name'] .'_'. $ftype,
+          'tablename' => $db_info['table'],
+          'handler' => 'content_handler_sort',
+          'content_field_name' => $field['field_name'] .'_'. $ftype,
+          'allow_empty' => TRUE,
+        );
+        
+        //If you are making a column sortable then you'll want to know what you are sorting by.
+        $data[$table_alias][$field['field_name'] .'_'. $ftype]['field']['title'] = $db_info['columns'][$ftype]['title'];
+        
+        unset($data[$table_alias][$field['field_name'] .'_'. $ftype]['argument']['additional fields']);
       }
-
+      
       return $data;
   }
 }