diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index cf7426b1f..c1e9954a9 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -25,10 +25,8 @@
         
         <div class="card">
           <div class="card-body">
-            <h4 class="header-title mb-4"><?=($address->id) ? "Adresse bearbeiten" : "Neue Adresse"?></h4>
+            <h4 class="header-title mb-4"><?=($address->id) ? "Person/Firma bearbeiten" : "Neue Person/Firma"?></h4>
             
-            
-                
             <form class="form-horizontal" method="post" action="<?=self::getUrl("Address", "save")?>">
               <div class="card">
                 <div class="card-body">
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index bebaa1922..ea1cffcfe 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -71,14 +71,14 @@ class AddressModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $sql = "SELECT Address.* FROM Address
-            LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id)
-            WHERE $where
+    $sql = "SELECT Address.* FROM Address, Addresstype
+            WHERE Addresstype.address_id = Address.id
+            AND $where
+            GROUP BY Addresstype.address_id
             ORDER BY Address.id";
-    //var_dump($sql);
     $res = $db->query($sql);
     if($db->num_rows($res)) {
-      while($data = $db->fetch_object($res)) {  
+      while($data = $db->fetch_object($res)) {
         $items[] = new Address($data);
       }
     }