diff --git a/_html/rahmen.html b/_html/rahmen.html
index 01d27c3..08bf282 100755
--- a/_html/rahmen.html
+++ b/_html/rahmen.html
@@ -115,20 +115,6 @@ $body_html
     <td background="_img/foot.gif" height="35" colspan="2">&nbsp;</td>
   </tr>
 <!-- ENDE Fusszeile -->
-
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://livestats.rc-heli.de/" : "http://livestats.rc-heli.de/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://livestats.rc-heli.de/piwik.php?idsite=4" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
 </table>
 </body>
 </html>
diff --git a/admin.php b/admin.php
index a5eb5fa..68a3523 100755
--- a/admin.php
+++ b/admin.php
@@ -92,7 +92,7 @@ elseif( isset($_GET["show"]) && $_GET["show"] == 'dme' && $_GET["do"] && $_GET["
 	$result = mysqli_query($dbconn, "DELETE FROM alarm2mail WHERE adresse = '$_GET[adresse]'") or die (mysqli_error($dbconn));
 	
 	// Pr�fen ob noch weitere Eintr�ge zur Org da sind, wenn nicht l�schen
-	if( $_GET["org"] )
+	if( $_GET["org"] != "" )
 	{
 		$result = mysqli_query($dbconn, "SELECT a.id AS dme_id, b.id AS kfz_id
 								FROM ric_zvei a
@@ -122,7 +122,7 @@ elseif( isset($_GET["show"]) && $_GET["show"] == 'dme' && $_GET["do"] && $_GET["
 elseif( isset($_GET["show"]) && $_GET["show"] == 'dme' && isset($_GET["do"]) && $_GET["do"] == 'setupdate' )
 {
 	// Schauen ob neue oder bestehende Organistaion gew�hlt wurde
-	if( isset($_REQUEST["new_org"]) )
+	if( isset($_REQUEST["new_org"]) && $_REQUEST["new_org"] != "" )
 	{
 		/////////////////$organisation	= $_REQUEST["new_org"];
 		
@@ -135,7 +135,7 @@ elseif( isset($_GET["show"]) && $_GET["show"] == 'dme' && isset($_GET["do"]) &&
 			$org_id	= $row["id"];
 		}
 		
-		if( !$org_id )
+		if( !isset($org_id) )
 		{
 			$result = mysqli_query($dbconn, "INSERT INTO organisation (org_name, org) VALUES ('$_REQUEST[new_org]', '$_REQUEST[new_org_typ]')");
 			
@@ -156,13 +156,13 @@ elseif( isset($_GET["show"]) && $_GET["show"] == 'dme' && isset($_GET["do"]) &&
 	{
 		$result = mysqli_query($dbconn, "SELECT a.id AS dme_id, b.id AS kfz_id
 								FROM ric_zvei a
-								LEFT JOIN kfz_fms b ON b.org_id = $_REQUEST[old_org]
-								WHERE a.org_id = '$_REQUEST[old_org]' OR b.org_id = '$_REQUEST[old_org]'") or die (mysqli_error($dbconn));
+								LEFT JOIN kfz_fms b ON b.org_id = $org_id
+								WHERE a.org_id = '$org_id' OR b.org_id = '$org_id'") or die (mysqli_error($dbconn));
 		$row = mysqli_fetch_array($result);
 		
 		if( !$row["dme_id"] && !$row["kfz_id"] )
 		{
-			$result = mysqli_query($dbconn, "DELETE FROM organisation WHERE id = '$_REQUEST[old_org]'") or die (mysqli_error($dbconn));
+			$result = mysqli_query($dbconn, "DELETE FROM organisation WHERE id = '$org_id'") or die (mysqli_error($dbconn));
 		}
 	}
 	
@@ -403,7 +403,7 @@ else
 	{
 		$show_ric = '--- <b>RIC/ZVEI</b> ----------<br>';
 		
-		$result	= mysqli_query("SELECT id, adresse, bezeichnung, rec_typ, org_id, formatierung_id FROM ric_zvei WHERE org_id = '$_REQUEST[search_org]' ORDER BY rec_typ ASC, adresse ASC") or die (mysqli_error($dbconn));
+		$result	= mysqli_query($dbconn,"SELECT id, adresse, bezeichnung, rec_typ, org_id, formatierung_id FROM ric_zvei WHERE org_id = '$_REQUEST[search_org]' ORDER BY rec_typ ASC, adresse ASC") or die (mysqli_error($dbconn));
 		while($row = mysqli_fetch_array($result))
 		{
 			$show_ric .= '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?do=update&id='.$row["id"].'&show=dme&org='.$row["org_id"].'&form='.$row["formatierung_id"].'">'.$row["adresse"].'</a> | '.$row["rec_typ"].' | '.$row["bezeichnung"].'<br>';