diff --git a/content/statistik/abgaengerstatistik.php b/content/statistik/abgaengerstatistik.php
index 88a40664f..b20641ec0 100644
--- a/content/statistik/abgaengerstatistik.php
+++ b/content/statistik/abgaengerstatistik.php
@@ -142,8 +142,8 @@ if($stsem!='')
 				studiengang_kz>0 AND studiengang_kz<10000 AND aktiv $stgwhere
 			ORDER BY kurzbzlang; ";
 	if($db->db_query($qry))
-	{
-		echo "<table class='liste table-autosort:0 table-stripeclass:alternate table-autostripe'>
+	{ ?>
+		<table class='liste table-autosort:0 table-stripeclass:alternate table-autostripe'>
 				<thead>
 					<tr>
 						<th></th>
@@ -170,28 +170,27 @@ if($stsem!='')
 					</tr>
 				</thead>
 				<tbody>
-			 ";
 		
-		while($row = $db->db_fetch_object())
-		{
-			echo '<tr>';
-			echo "<td>".strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)</td>";
-			echo "<td align='center'>$row->abgewiesene_maennlich</td>";
-			echo "<td align='center'>$row->abgewiesene_weiblich</td>";
-			echo "<td align='center'>$row->abgewiesene</td>";
-			echo "<td align='center'>$row->abbrecher_maennlich</td>";
-			echo "<td align='center'>$row->abbrecher_weiblich</td>";
-			echo "<td align='center'>$row->abbrecher</td>";
-			echo "<td align='center'>$row->unterbrecher_maennlich</td>";
-			echo "<td align='center'>$row->unterbrecher_weiblich</td>";
-			echo "<td align='center'>$row->unterbrecher</td>";
-			echo "<td align='center'>$row->absolvent_maennlich</td>";
-			echo "<td align='center'>$row->absolvent_weiblich</td>";
-			echo "<td align='center'>$row->absolvent</td>";
-			echo "</tr>";
-		}
-		echo '</tbody></table>';
-	}
+		<?php while($row = $db->db_fetch_object())
+		{ ?>
+			<tr>
+				<td><?= strtoupper($row->typ.$row->kurzbz)?> (<?= $row->kurzbzlang ?>)</td>
+				<td align='center'><?= $row->abgewiesene_maennlich ?></td>
+				<td align='center'><?= $row->abgewiesene_weiblich ?></td>
+				<td align='center'><?= $row->abgewiesene ?></td>
+				<td align='center'><?= $row->abbrecher_maennlich ?></td>
+				<td align='center'><?= $row->abbrecher_weiblich ?></td>
+				<td align='center'><?= $row->abbrecher ?></td>
+				<td align='center'><?= $row->unterbrecher_maennlich ?></td>
+				<td align='center'><?= $row->unterbrecher_weiblich ?></td>
+				<td align='center'><?= $row->unterbrecher ?></td>
+				<td align='center'><?= $row->absolvent_maennlich ?></td>
+				<td align='center'><?= $row->absolvent_weiblich ?></td>
+				<td align='center'><?= $row->absolvent ?></td>
+			</tr>
+		<?php } ?>
+		</tbody></table>
+	<?php }
 }
 ?>
 </body>
diff --git a/include/statistik.class.php b/include/statistik.class.php
index 94d0cfe78..81a5e2b7f 100644
--- a/include/statistik.class.php
+++ b/include/statistik.class.php
@@ -525,18 +525,15 @@ class statistik extends basis_db
 				{
 					$this->html.= '<tr>';
 					$anzahl_spalten = $this->db_num_fields($this->data);
+
 					for($spalte=0;$spalte<$anzahl_spalten;$spalte++)
 					{
 						$name = $this->db_field_name($this->data,$spalte);
 						$this->html.= '<td>'.$row->$name.'</td>';
 						$this->csv.= '"'.$row->$name.'",';
-						
-						if($spalte>0)
-						{
-							$name_spalte_0 = $this->db_field_name($this->data,0);
-							$this->json[$row->$name_spalte_0][$name]=$row->$name;
-						}
-					}	
+					}
+
+					$this->json[] = $row;
 					$this->html.= '</tr>';
 					$this->csv=substr($this->csv,0,-1)."\n";
 				}
@@ -590,4 +587,3 @@ function parseVars($value)
 	return array_unique($result);
 }
 }
-?>