diff --git a/lib/content_views/accepted_jobs_page.dart b/lib/content_views/accepted_jobs_page.dart
index 2466889..b850e00 100644
--- a/lib/content_views/accepted_jobs_page.dart
+++ b/lib/content_views/accepted_jobs_page.dart
@@ -44,7 +44,7 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
   @override
   void initState() {
     Future.delayed(const Duration(seconds: 0), () async {
-      _jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.STATE_ACCEPTED).findAll();
+      _jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAccepted).findAll();
 
       _initCompleted = true;
 
diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart
index d0ed0ba..76d87cd 100644
--- a/lib/content_views/assigned_jobs_page.dart
+++ b/lib/content_views/assigned_jobs_page.dart
@@ -80,7 +80,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
   Future<List<Widget>> _createListEntries() async {
     List<Widget> entries = [];
 
-    var jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.STATE_ASSIGNED).findAll();
+    var jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll();
     for (var job in jobs) {
       entries.add(ExpandableNotifier(
         child: ListTile(
diff --git a/lib/content_views/finished_jobs_page.dart b/lib/content_views/finished_jobs_page.dart
index 45869ab..7e1c1e6 100644
--- a/lib/content_views/finished_jobs_page.dart
+++ b/lib/content_views/finished_jobs_page.dart
@@ -44,7 +44,7 @@ class _FinishedJobsPageState extends State<FinishedJobsPage> {
   @override
   void initState() {
     Future.delayed(const Duration(seconds: 0), () async {
-      _jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.STATE_FINISHED).findAll();
+      _jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateFinished).findAll();
 
       _initCompleted = true;
 
diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart
index 471dd19..aae791c 100644
--- a/lib/content_views/task_list_page.dart
+++ b/lib/content_views/task_list_page.dart
@@ -457,7 +457,7 @@ class _TaskListPageState extends State<TaskListPage> {
       finTourMessage.finTour.tasks.add(finTourTask);
     }
 
-    MqttCore.instance.publishPayloadMessage("job", finTourMessage.toJson());
+    MqttCore.instance.publishPayloadMessage("fin_tour", finTourMessage.toJson());
 
     widget.tour.state = 9;
     await MyApp.isarInstance.writeTxn(() async {
diff --git a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart
index 38ada2d..86b4734 100644
--- a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart
+++ b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart
@@ -59,6 +59,8 @@ showPickupDeliveryStatusPopup(BuildContext context, TaskInfo taskInfo, Function(
                             Visibility(visible: selectedTourEntry != null ? selectedTourEntry!.queryRemark : false, child: Util.getDefaultTextField("Bemerkung")),
                             const SizedBox(height: 20),
                             getDefaultButton('Übernehmen', buttonHeight: 50, () => {
+                              Navigator.of(context).pop(),
+
                               onFinished(selectedTourEntry)
                             })
                           ],
diff --git a/lib/tools/constants.dart b/lib/tools/constants.dart
index 15c1cce..dd7b171 100644
--- a/lib/tools/constants.dart
+++ b/lib/tools/constants.dart
@@ -16,8 +16,8 @@ class Constants {
   static const String messageTopicHideRightButton = "hide_right_button";
   static const String messageShowPopup = "show_popup";
 
-  static const int STATE_ASSIGNED = 0;
-  static const int STATE_ACCEPTED = 1;
-  static const int STATE_FINISHED = 2;
-  static const int STATE_FINISHED_NOT_CONFIRMED = 9;
+  static const int stateAssigned = 0;
+  static const int stateAccepted = 1;
+  static const int stateFinished = 2;
+  static const int stateFinishedNotConfirmed = 9;
 }
\ No newline at end of file
diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart
index fc7d3d9..2c619c8 100644
--- a/lib/tools/mqtt_core.dart
+++ b/lib/tools/mqtt_core.dart
@@ -238,7 +238,7 @@ class MqttCore {
         MyApp.isarInstance.jobs.putSync(newJob);
       });
 
-      if (newJob.state == Constants.STATE_ASSIGNED) {
+      if (newJob.state == Constants.stateAssigned) {
         if (newJob.global) {
           await Util.playMp3('aaa.mp3');
         } else {