diff --git a/api/v3/PostcodeAT/Get.php b/api/v3/PostcodeAT/Get.php
index 62256f2..e0071da 100644
--- a/api/v3/PostcodeAT/Get.php
+++ b/api/v3/PostcodeAT/Get.php
@@ -77,11 +77,12 @@ function civicrm_api3_postcode_a_t_get($params) {
   }
 
   $selectFields = $validatedParams['return'];
-  $sql = "SELECT DISTINCT {$selectFields} FROM `civicrm_postcodeat` WHERE 1 {$where} LIMIT 0, 100";
+  $sql = "SELECT DISTINCT {$selectFields} FROM `civicrm_postcodeat` WHERE 1 {$where}";
   // For ortnam (City) we select gemnam38 (Politische Gemeinde) as well
   if ($selectFields == 'ortnam') {
-    $sql.= " UNION SELECT gemnam38 FROM `civicrm_postcodeat` WHERE 1 {$where} LIMIT 0, 100";
+    $sql.= " UNION SELECT gemnam38 FROM `civicrm_postcodeat` WHERE 1 {$where}";
   }
+  $sql .= " LIMIT 0, 100";
   $dao = CRM_Core_DAO::executeQuery($sql, $values);
 
   $returnValues = array();
diff --git a/info.xml b/info.xml
index 6a92ec9..8d5f1f8 100644
--- a/info.xml
+++ b/info.xml
@@ -10,11 +10,11 @@
     <email>mjw@mjwconsult.co.uk</email>
   </maintainer>
   <urls>
-    <url desc="Main Extension Page">https://github.com/mattwire/de.systopia.postcodeat</url>
+    <url desc="Main Extension Page">https://github.com/systopia/de.systopia.postcodeat</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2017-07-20</releaseDate>
-  <version>1.0.beta1</version>
+  <releaseDate>2017-07-25</releaseDate>
+  <version>1.0.beta2</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>4.6</ver>