diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 01521ec24..28f49f8eb 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -718,7 +718,7 @@ function validateWorkflowItem(id) {
             $('#export-button-label').hide();
             $('#progress-bar').show();
             setTimeout(updateExportProgress, 200);
-            $('#export-button').addClass("bg-secondary");
+            $('#export-button').addClass("bg-dark");
             $('#export-button').prop("onclick", null).off("click");
             //$('#export-button').prop("disabled", true);
           } else {
@@ -776,7 +776,7 @@ function validateWorkflowItem(id) {
     $('#progress-bar').addClass("bg-primary").removeClass("bg-success");
     $('#export-button').prop("disabled", false);
     $('#progress-bar').hide();
-    $('#export-button').removeClass("bg-secondary");
+    $('#export-button').removeClass("bg-dark");
     $('#export-button').click(exportButtonClick);
     $('#export-button-label').show();
   }
diff --git a/application/Termination/TerminationModel.php b/application/Termination/TerminationModel.php
index 467983564..1dc4bfcf7 100644
--- a/application/Termination/TerminationModel.php
+++ b/application/Termination/TerminationModel.php
@@ -104,7 +104,7 @@ class TerminationModel {
             LEFT JOIN Building ON (Building.id = Termination.building_id)
             LEFT JOIN Terminationstatus ON (Terminationstatus.id = Termination.status_id)
             WHERE $where
-            ORDER BY Building.network_id, Building.networksection_id, Building.code, code
+            ORDER BY Building.network_id, Building.zip, Building.city, Building.networksection_id, Building.street, Building.code, code
            ";
     
     if(is_array($limit) && count($limit)) {