diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 543801ae6..bb6f72bf6 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -200,22 +200,27 @@
                           <th>Rohrfarbe</th>
                         </tr>
                         <tr>
-                          <td><?=$term->building->workflowitems['anschlusspunkt_typ']->value->value_string?></td>
-                          <td><?=$term->building->workflowitems['anschlusspunkt_name']->value->value_string?></td>
-                          <td><?=($term->building->workflowitems['anschlusspunkt_gps']->value->value_string) ? "<a href='https://maps.google.com/maps?t=k&q=loc:".join("+", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."' target='_blank'><i class='fas fa-external-link-alt'></i> ".join(", ", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."</a>" : ""?></td>
-                          <td><?=$term->building->workflowitems['rohrverband_name']->value->value_string?></td>
-                          <td><?=$term->building->workflowitems['rohrtype']->value->value_string?></td>
+                          <td><?=($term->building->getWorkflowvalue("ist_anschlusspunkt_typ")) ? $term->building->getWorkflowvalue("anschlusspunkt_typ") : $term->building->getWorkflowvalue("anschlusspunkt_typ")?></td>
+                          <td><?=($term->building->getWorkflowvalue('ist_anschlusspunkt_name')) ? $term->building->getWorkflowvalue('ist_anschlusspunkt_name') : $term->building->getWorkflowvalue('anschlusspunkt_name')?></td>
+                          <td>
+                            <?php if($term->building->getWorkflowvalue('ist_anschlusspunkt_gps')): ?>
+                              <a href='https://maps.google.com/maps?t=k&q=loc:<?=join("+", $term->building->workflowitems['ist_anschlusspunkt_gps']->value->gps)?>' target='_blank'><i class='fas fa-external-link-alt'></i> <?=join(", ", $term->building->workflowitems['ist_anschlusspunkt_gps']->value->gps)?></a></td>
+                            <?php else: ?>
+                              <a href='https://maps.google.com/maps?t=k&q=loc:<?=join("+", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)?>' target='_blank'><i class='fas fa-external-link-alt'></i> <?=join(", ", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)?></a></td>
+                            <?php endif; ?>
+                          <td><?=($term->building->getWorkflowvalue('ist_rohrverband_name')) ? $term->building->getWorkflowvalue('ist_rohrverband_name') : $term->building->getWorkflowvalue('rohrverband_name')?></td>
+                          <td><?=($term->building->getWorkflowvalue('ist_rohrtype')) ? $term->building->getWorkflowvalue('ist_rohrtype') : $term->building->getWorkflowvalue('rohrtype')?></td>
                           <td>
                             <span
                               style="
-                                background-color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hex"]?>;
-                                <?php if(TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["mark"]): ?>
-                                color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hexfg"]?>;
+                                background-color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hex"]?>;
+                                <?php if(TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["mark"]): ?>
+                                color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hexfg"]?>;
                                 <?php else: ?>
-                                color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hex"]?>;
+                                color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hex"]?>;
                                 <?php endif; ?>
                                 border-radius: 3px;
-                              ">-------</span> <?=ucfirst($term->building->workflowitems['rohrfarbe']->value->value_string)?>
+                              ">-------</span> <?=ucfirst($term->building->getWorkflowvalue('rohrfarbe'))?>
                           </td>
                         </tr>
                       </table>
diff --git a/application/Building/Building.php b/application/Building/Building.php
index 0b92464e9..9f402c2ed 100644
--- a/application/Building/Building.php
+++ b/application/Building/Building.php
@@ -78,6 +78,14 @@ class Building extends mfBaseModel {
     return $code;
   }
   
+  public function getWorkflowvalue($itemname, $type = "string") {
+    if(array_key_exists($itemname, $this->getProperty("workflowitems"))) {
+      return $this->getProperty("workflowitems")[$itemname]->value->{"value_$type"};
+    }
+    
+    return null;
+  }
+  
   public function getLaeaCoordinates() {
     if(!$this->gps_lat || !$this->gps_lat) {
       return false;