diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php
index a338c4c5b..33932752e 100644
--- a/application/Admin/functions/RtrReporting.php
+++ b/application/Admin/functions/RtrReporting.php
@@ -60,7 +60,8 @@ class Admin_RtrReporting {
         "Tulwitz" => "Fladnitz an der Teichalm",
         "Fladnitz/T." => "Fladnitz an der Teichalm",
         "Fladnitz a. d. Teichalm" => "Fladnitz an der Teichalm",
-        "Stübing" => "Deutschfeistritz",
+        //"Stübing" => "Deutschfeistritz",
+        "Stübing" => "Gratkorn",
         "Deutsch Feistritz"=> "Deutschfeistritz",
         "Minihof Liebau" => "Minihof-Liebau",
         "Windisch-Minihof" => "Minihof-Liebau",
@@ -250,6 +251,9 @@ class Admin_RtrReporting {
             } elseif(substr($rtr_code, 0, 4) == 1042) {
                 $prod_code = 10420;
                 $bb = "50,00";
+            } elseif(substr($rtr_code, 0, 4) == 1222) {
+                $prod_code = 12220;
+                $bb = "400,00";
             } else {
                 continue; // incompatible product
             }
@@ -282,8 +286,33 @@ class Admin_RtrReporting {
             foreach($raster as $prod_code => $data) {
                 $csv .= $rastercode . ";";
                 $csv .= $prod_code . ";";
-                for($i = 0; $i < 16; $i++) {
-                    $csv .= $data["bb"] . ";";
+                for($i = 0; $i < 4; $i++) {
+                    if($prod_code == 12220) {
+                        $csv .= "400;";
+                    } else {
+                        $csv .= $data["bb"] . ";";
+                    }
+                }
+                for($i = 0; $i < 4; $i++) {
+                    if($prod_code == 12220) {
+                        $csv .= "100;";
+                    } else {
+                        $csv .= $data["bb"] . ";";
+                    }
+                }
+                for($i = 0; $i < 4; $i++) {
+                    if($prod_code == 12220) {
+                        $csv .= "400;";
+                    } else {
+                        $csv .= $data["bb"] . ";";
+                    }
+                }
+                for($i = 0; $i < 4; $i++) {
+                    if($prod_code == 12220) {
+                        $csv .= "100;";
+                    } else {
+                        $csv .= $data["bb"] . ";";
+                    }
                 }
                 $csv .= ($data["user_count"]) ?: ($data["unit_sum"]) ?: 1;
                 $csv .= "\n";
@@ -338,9 +367,11 @@ class Admin_RtrReporting {
 
 
             if($contract->termination_id) {
+                $strasse = trim($contract->termination->building->street);
                 $plz = trim($contract->termination->building->zip);
                 $ort = trim($contract->termination->building->city);
             } else {
+                $strasse = trim($contract->owner->street);
                 $plz = trim($contract->owner->zip);
                 $ort = trim($contract->owner->city);
             }
@@ -401,6 +432,35 @@ class Admin_RtrReporting {
                 $gemid = $ort2gem["$plz--$ort"];
             }
 
+            if($gemid == 61761 && preg_match('/^plenzengreith/i', $strasse)) {
+                $gemid = 61763;
+            }
+
+            /*if($gemid == 62272 && $prod_code == 10421) {
+                var_dump($contract);exit;
+            }*/
+
+            /*if($gemid == 61760 && $prod_code == 14312) {
+                var_dump($contract);exit;
+            }*/
+
+            /*if($gemid == 60659 && $prod_code == 10421) {
+                var_dump($contract);
+            }*/
+
+            /*if($gemid == 60642 && $prod_code == 10421) {
+                var_dump($contract);
+            }*/
+
+            /*if($gemid == 60628 && $prod_code == 14312) {
+                var_dump($contract);
+            }*/
+
+            /*if($gemid == 60326 && $prod_code == 10421) {
+                var_dump($contract);
+            }*/
+
+
             if($gemid == 90001) $gemid = 90101;
 
             if(!array_key_exists($gemid, $data)) {
@@ -556,7 +616,7 @@ class Admin_RtrReporting {
         $sql = "SELECT product_id FROM `ProductAttribute`
                 LEFT JOIN ProducttechAttribute ON (ProductAttribute.producttechattribute_id = ProducttechAttribute.id)
                 WHERE ProducttechAttribute.name='rtr_tech_code'
-                AND (ProductAttribute.value LIKE '1042%' OR ProductAttribute.value LIKE '1431%')";
+                AND (ProductAttribute.value LIKE '1042%' OR ProductAttribute.value LIKE '1431%' OR ProductAttribute.value LIKE '1222%')";
 
         $res = $this->db->query($sql);
         while($data = $this->db->fetch_object($res)) {