diff --git a/boranga/components/species_and_communities/models.py b/boranga/components/species_and_communities/models.py
index 34fb85dfd..6363ae751 100644
--- a/boranga/components/species_and_communities/models.py
+++ b/boranga/components/species_and_communities/models.py
@@ -1220,7 +1220,7 @@ class Community(RevisionedMixin):
     RELATED_ITEM_CHOICES = [("conservation_status", "Conservation Status")]
 
     community_number = models.CharField(max_length=9, blank=True, default="")
-    renamed_from = models.OneToOneField(
+    renamed_from = models.ForeignKey(
         "self",
         on_delete=models.PROTECT,
         null=True,
@@ -1509,23 +1509,20 @@ def get_related_items(self, filter_type, **kwargs):
                             )
                         )
                 # Add renamed to related items to the list (limited to one degree of separation)
-                if (
-                    a_field.name == "renamed_to"
-                    and hasattr(self, "renamed_to")
-                    and self.renamed_to
-                ):
-                    if filter_type == "for_occurrence":
-                        return_list.extend(
-                            self.renamed_to.get_related_items(
-                                "conservation_status_and_occurrences"
+                if self.renamed_to.exists():
+                    for community in self.renamed_to.all():
+                        if filter_type == "for_occurrence":
+                            return_list.extend(
+                                community.get_related_items(
+                                    "conservation_status_and_occurrences"
+                                )
                             )
-                        )
-                    else:
-                        return_list.extend(
-                            self.renamed_to.get_related_items(
-                                "all_except_renamed_community"
+                        else:
+                            return_list.extend(
+                                community.get_related_items(
+                                    "all_except_renamed_community"
+                                )
                             )
-                        )
 
         return return_list
 
@@ -1807,10 +1804,22 @@ def copy_for_rename(self, request):
         new_community = Community.objects.get(pk=self.pk)
         new_community.pk = None
         new_community.community_number = ""
-        new_community.processing_status = Community.PROCESSING_STATUS_DRAFT
+        new_community.processing_status = Community.PROCESSING_STATUS_ACTIVE
         new_community.renamed_from_id = self.id
         new_community.save(version_user=request.user)
 
+        # Copy the community publishing status but set it to private (not public)
+        try:
+            publishing_status = CommunityPublishingStatus.objects.get(
+                id=self.community_publishing_status.id
+            )
+            publishing_status.pk = None
+            publishing_status.community = new_community
+            publishing_status.community_public = False
+            publishing_status.save()
+        except CommunityPublishingStatus.DoesNotExist:
+            CommunityPublishingStatus.objects.get_or_create(community=self)
+
         new_community.regions.add(*self.regions.all())
         new_community.districts.add(*self.districts.all())
 
diff --git a/boranga/components/species_and_communities/serializers.py b/boranga/components/species_and_communities/serializers.py
index bda9d4c15..f351ccd8c 100755
--- a/boranga/components/species_and_communities/serializers.py
+++ b/boranga/components/species_and_communities/serializers.py
@@ -1278,6 +1278,7 @@ class InternalCommunitySerializer(BaseCommunitySerializer):
     user_edit_mode = serializers.SerializerMethodField()
     can_user_edit = serializers.SerializerMethodField()
     can_add_log = serializers.SerializerMethodField()
+    can_user_reopen = serializers.SerializerMethodField()
     renamed_from = SimpleCommunityDisplaySerializer(read_only=True, allow_null=True)
     readonly = serializers.SerializerMethodField(read_only=True)
 
@@ -1302,6 +1303,7 @@ class Meta:
             "readonly",
             "can_user_edit",
             "can_user_view",
+            "can_user_reopen",
             "current_assessor",
             "user_edit_mode",
             "comment",
@@ -1346,6 +1348,12 @@ def get_can_user_edit(self, obj):
             return obj.can_user_edit
         return False
 
+    def get_can_user_reopen(self, obj):
+        request = self.context["request"]
+        if is_species_communities_approver(request):
+            return obj.can_user_reopen(request)
+        return False
+
     def get_current_assessor(self, obj):
         return {
             "id": self.context["request"].user.id,
diff --git a/boranga/components/users/serializers.py b/boranga/components/users/serializers.py
index fe6afd508..aed6648e8 100755
--- a/boranga/components/users/serializers.py
+++ b/boranga/components/users/serializers.py
@@ -20,6 +20,8 @@
     SubmitterInformation,
 )
 from boranga.helpers import (
+    is_conservation_status_approver,
+    is_conservation_status_assessor,
     is_contributor,
     is_internal,
     is_occurrence_approver,
@@ -265,6 +267,18 @@ def to_representation(self, instance):
         if instance.email_user == request.user.id and is_contributor(request):
             return ret
 
-        if not is_occurrence_assessor(request) and not is_occurrence_approver(request):
+        if (
+            hasattr(instance, "occurrence_report")
+            and (
+                not is_occurrence_assessor(request)
+                and not is_occurrence_approver(request)
+            )
+            or hasattr(instance, "conservation_status")
+            and (
+                not is_conservation_status_assessor(request)
+                and not is_conservation_status_approver(request)
+            )
+        ):
             ret.pop("contact_details")
+
         return ret
diff --git a/boranga/components/users/signals.py b/boranga/components/users/signals.py
index dbf638f82..18d63566a 100644
--- a/boranga/components/users/signals.py
+++ b/boranga/components/users/signals.py
@@ -113,8 +113,20 @@ def add_external_user_to_external_contributors_group(sender, user, request, **kw
         "user_logged_in_signal running add_external_user_to_external_contributors_group function"
     )
 
+    external_contributor_group = SystemGroup.objects.get(
+        name=settings.GROUP_NAME_EXTERNAL_CONTRIBUTOR
+    )
+
     # Only add external users to the external contributors group
     if is_internal(request):
+        # Check if the internal user is in the external contributors group and remove them if so
+        if SystemGroupPermission.objects.filter(
+            system_group=external_contributor_group, emailuser=user
+        ).exists():
+            SystemGroupPermission.objects.filter(
+                system_group=external_contributor_group, emailuser=user
+            ).delete()
+            external_contributor_group.save()
         return
 
     # If user is blacklisted, don't add them to the external contributors group
@@ -125,9 +137,7 @@ def add_external_user_to_external_contributors_group(sender, user, request, **kw
         return
 
     # If user is already in the external contributors group, don't add them again
-    external_contributor_group = SystemGroup.objects.get(
-        name=settings.GROUP_NAME_EXTERNAL_CONTRIBUTOR
-    )
+
     if SystemGroupPermission.objects.filter(
         system_group=external_contributor_group, emailuser=user
     ).exists():
diff --git a/boranga/frontend/boranga/src/components/common/communities_dashboard.vue b/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
index 4844b0400..05782bb04 100644
--- a/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
@@ -944,19 +944,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.communities_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
@@ -1153,7 +1140,6 @@ export default {
         this.$nextTick(() => {
             vm.initialiseCommunityNameLookup();
             vm.initialiseCommunityIdLookup();
-            vm.initialiseSearch();
             vm.addEventListeners();
             // -- to set the select2 field with the session value if exists onload()
             if (sessionStorage.getItem("filterCommunityName") != 'all' && sessionStorage.getItem("filterCommunityName") != null) {
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index d196c7b75..db08d5555 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -59,7 +59,7 @@
                     <label for="" class="col-sm-4 control-label fw-bold">Community Name <span
                             class="text-danger">*</span></label>
                     <div class="col-sm-8" :id="select_community_name">
-                        <select :disabled="conservation_status_obj.readonly" :id="community_name_lookup"
+                        <select :disabled="conservation_status_obj.readonly || 'Unlocked' == conservation_status_obj.processing_status" :id="community_name_lookup"
                             :name="community_name_lookup" :ref="community_name_lookup" class="form-control" />
                     </div>
                 </div>
@@ -76,14 +76,14 @@
                         <label for="change_code" class="col-sm-4 col-form-label fw-bold">Change Type <span
                                 class="text-danger">*</span></label>
                         <div class="col-sm-8">
-                            <template v-if="!isReadOnly">
+                            <template v-if="!isReadOnly && 'Unlocked' != conservation_status_obj.processing_status">
                                 <template
                                     v-if="change_codes && change_codes.length > 0 && conservation_status_obj.change_code_id && !change_codes.map((d) => d.id).includes(conservation_status_obj.change_code_id)">
                                     <input type="text" v-if="conservation_status_obj.change_code"
                                         class="form-control mb-3"
                                         :value="conservation_status_obj.change_code + ' (Now Archived)'" disabled />
                                     <div class="mb-3 text-muted">
-                                        Change datum to:
+                                        Change change type to:
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
@@ -94,7 +94,7 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
+                                <input class="form-control" type="text" disabled
                                     v-model="conservation_status_obj.change_code" />
                             </template>
                         </div>
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 5ebb7700f..51609115c 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -60,7 +60,7 @@
                     <label :for="scientific_name_lookup" class="col-sm-4 col-form-label fw-bold">Scientific Name: <span
                             class="text-danger">*</span></label>
                     <div class="col-sm-8" :id="select_scientific_name">
-                        <select :disabled="isReadOnly" :id="scientific_name_lookup" :name="scientific_name_lookup"
+                        <select :disabled="isReadOnly || 'Unlocked' == conservation_status_obj.processing_status" :id="scientific_name_lookup" :name="scientific_name_lookup"
                             :ref="scientific_name_lookup" class="form-control" />
                     </div>
                 </div>
@@ -84,14 +84,14 @@
                         <label for="change_code" class="col-sm-4 col-form-label fw-bold">Change Type <span
                                 class="text-danger">*</span></label>
                         <div class="col-sm-8">
-                            <template v-if="!isReadOnly">
+                            <template v-if="!isReadOnly && 'Unlocked' != conservation_status_obj.processing_status">
                                 <template
                                     v-if="change_codes && change_codes.length > 0 && conservation_status_obj.change_code_id && !change_codes.map((d) => d.id).includes(conservation_status_obj.change_code_id)">
                                     <input type="text" v-if="conservation_status_obj.change_code"
                                         class="form-control mb-3"
                                         :value="conservation_status_obj.change_code + ' (Now Archived)'" disabled />
                                     <div class="mb-3 text-muted">
-                                        Change datum to:
+                                        Change change type to:
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
@@ -102,7 +102,7 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
+                                <input class="form-control" type="text" disabled
                                     v-model="conservation_status_obj.change_code" />
                             </template>
                         </div>
@@ -614,7 +614,7 @@ export default {
             ) {
                 return true;
             } else {
-                if (this.conservation_status_obj.processing_status == "Ready For Agenda") {
+                if (["Ready For Agenda", "Approved", "Closed", "DeListed", "Discarded"].includes(this.conservation_status_obj.processing_status)) {
                     return true;
                 }
                 if (
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
index 21c9b60ca..2b8949e36 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
@@ -1275,19 +1275,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.cs_communities_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
index 4885ac067..c6420fc00 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
@@ -1480,19 +1480,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.fauna_cs_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
index bcc84863b..a48538b12 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
@@ -1468,19 +1468,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.flora_cs_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/map_functions.js b/boranga/frontend/boranga/src/components/common/map_functions.js
index c0b560db6..748c4b060 100644
--- a/boranga/frontend/boranga/src/components/common/map_functions.js
+++ b/boranga/frontend/boranga/src/components/common/map_functions.js
@@ -182,6 +182,10 @@ export async function queryLayerAtPoint(map_component, layer, coordinate) {
  * @param {string=} subMode The submode to set the map to (e.g. draw: 'Polygon', 'Point')
  */
 export function set_mode(mode, subMode = null) {
+    if (!this.map.getTargetElement()) {
+        console.warn('Map not initialized in set_mode function. Returning false.');
+        return false;
+    }
     // Toggle map mode on/off when the new mode is the old one
     if (this.mode == mode) {
         if (this.subMode == subMode) {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
index 2c92daa4c..10b1bea93 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
@@ -390,10 +390,8 @@ export default {
             let vm = this;
             this.$nextTick(() => {
                 vm.addEventListeners();
-                //vm.initialiseSearch();
             });
         },
-
     }
 </script>
 
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_community_dashboard.vue
index b63264ce6..a03ef6192 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_community_dashboard.vue
@@ -673,19 +673,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.community_occ_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_fauna_dashboard.vue
index 5aa8cb55a..88280244d 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_fauna_dashboard.vue
@@ -667,19 +667,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.fauna_occ_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_flora_dashboard.vue
index 61beaff8e..1a165fae2 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_flora_dashboard.vue
@@ -670,19 +670,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.flora_occ_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_report_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_report_community_dashboard.vue
index d87e44350..bdd262886 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_report_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_report_community_dashboard.vue
@@ -748,19 +748,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.community_ocr_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_report_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_report_fauna_dashboard.vue
index 92e9a9a85..cc965c0f0 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_report_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_report_fauna_dashboard.vue
@@ -752,19 +752,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.fauna_ocr_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/occurrence_report_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/occurrence_report_flora_dashboard.vue
index c556b7b0b..52100e152 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence_report_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence_report_flora_dashboard.vue
@@ -752,19 +752,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.flora_ocr_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         exportData: function (format) {
             let vm = this;
             const columns_new = {
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
index 8ab7cf461..84b241b6e 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
@@ -195,10 +195,10 @@ export default {
                             if (!vm.is_readonly) {
                                 if (full.visible) {
                                     links += `<a href='#${full.id}' data-edit-document='${full.id}'>Edit</a><br/>`;
-                                    links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;                                
+                                    links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;
                                 }
                                 else {
-                                    links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;                                    
+                                    links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;
                                 }
                             }
                             links += `<a href='#' data-history-document='${full.id}'>History</a><br>`;
@@ -386,7 +386,6 @@ export default {
         let vm = this;
         this.$nextTick(() => {
             vm.addEventListeners();
-            //vm.initialiseSearch();
         });
     }
 }
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
index cf8dd8904..939632bd9 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
@@ -197,10 +197,10 @@ export default {
                             if (!vm.is_readonly) {
                                 if (full.visible) {
                                     links += `<a href='#${full.id}' data-edit-document='${full.id}'>Edit</a><br/>`;
-                                    links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;                                
+                                    links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;
                                 }
                                 else {
-                                    links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;                                    
+                                    links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;
                                 }
                             }
                             links += `<a href='#' data-history-document='${full.id}'>History</a><br>`;
@@ -384,7 +384,6 @@ export default {
         let vm = this;
         this.$nextTick(() => {
             vm.addEventListeners();
-            //vm.initialiseSearch();
         });
     },
 
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_documents.vue
index 284a08325..88c58cc74 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_documents.vue
@@ -263,17 +263,12 @@ export default {
             let vm = this;
             this.$nextTick(() => {
                 vm.addEventListeners();
-                //vm.initialiseSearch();
                 if(vm.$parent.document_selection!=null){
-
                     if(vm.$parent.document_selection==="selectAll"){
-                        //alert(vm.$parent.document_selection)
                         document.getElementById('doc_select_all'+vm.species_community.id).checked=true;
                     }
                     else{
-                        //alert(vm.$parent.document_selection)
                         document.getElementById('doc_select_individual'+vm.species_community.id).checked=true;
-                        //$('#doc_select_individual').checked=true;
                     }
                 }
 
diff --git a/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
index 2d32aa924..cb8f1f023 100644
--- a/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
@@ -1430,19 +1430,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.fauna_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
     },
     mounted: function () {
         this.fetchFilterLists();
@@ -1459,7 +1446,6 @@ export default {
             vm.initialisePhyloGroupLookup();
             vm.initialiseFamilyLookup();
             vm.initialiseGeneraLookup()
-            vm.initialiseSearch();
             vm.addEventListeners();
             // -- to set the select2 field with the session value if exists onload()
             if (sessionStorage.getItem("filterFaunaScientificName") != 'all' && sessionStorage.getItem("filterFaunaScientificName") != null) {
diff --git a/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
index 50705e6df..b5952cb0b 100755
--- a/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
@@ -1434,19 +1434,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.flora_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         delay(callback, ms) {
             var timer = 0;
 
@@ -1475,7 +1462,6 @@ export default {
             vm.initialisePhyloGroupLookup();
             vm.initialiseFamilyLookup();
             vm.initialiseGeneraLookup();
-            vm.initialiseSearch();
             vm.addEventListeners();
             // -- to set the select2 field with the session value if exists onload()
             if (sessionStorage.getItem("filterFloraScientificName") != 'all' && sessionStorage.getItem("filterFloraScientificName") != null) {
diff --git a/boranga/frontend/boranga/src/components/common/submitter_information.vue b/boranga/frontend/boranga/src/components/common/submitter_information.vue
index 3b057c1d0..0bd1b9df4 100644
--- a/boranga/frontend/boranga/src/components/common/submitter_information.vue
+++ b/boranga/frontend/boranga/src/components/common/submitter_information.vue
@@ -36,7 +36,7 @@
                                 v-model="submitter_information.name">
                         </div>
                     </div>
-                    <div v-if="show_submitter_contact_details" class="row mb-3 pb-3 border-bottom">
+                    <div v-if="show_submitter_contact_details && Object.hasOwn(submitter_information, 'contact_details')" class="row mb-3 pb-3 border-bottom">
                         <label for="contact_details" class="col-sm-2 col-form-label">Contact Details</label>
                         <div class="col-sm-6">
                             <textarea class="form-control" id="contact_details"
diff --git a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
index 58e85cf01..5cbce99fc 100644
--- a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
+++ b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
@@ -195,9 +195,14 @@ export default {
             let payload = new Object();
             Object.assign(payload, vm.conservation_status_obj);
             await vm.$http.post(vm.cs_proposal_form_url, payload).then(res => {
+                let swalHtml = '<p>Your conservation status proposal has been saved as a draft.</p>';
+                if (vm.saveExitCSProposal) {
+                    swalHtml += '<p>It has <span class="fw-bold">NOT</span> been submitted.</p>';
+                    swalHtml += '<p>You can find the draft on the conservation status dashboard to continue working on the proposal later.</p>';
+                }
                 swal.fire({
-                    title: 'Proposal Saved',
-                    text: 'Your conservation status proposal has been saved',
+                    title: 'Conservation Status Proposal Saved',
+                    html: swalHtml,
                     icon: 'success',
                     customClass: {
                         confirmButton: 'btn btn-primary',
diff --git a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal_table.vue b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal_table.vue
index 67c1330c7..66ef417c9 100644
--- a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal_table.vue
+++ b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal_table.vue
@@ -599,19 +599,6 @@ export default {
                 helpers.enablePopovers();
             });
         },
-        initialiseSearch: function () {
-            this.submitterSearch();
-        },
-        submitterSearch: function () {
-            let vm = this;
-            vm.$refs.conservation_status_datatable.table.dataTableExt.afnFiltering.push(
-                function (settings, data, dataIndex, original) {
-                    let filtered_submitter = vm.filterProposalSubmitter;
-                    if (filtered_submitter == 'All') { return true; }
-                    return filtered_submitter == original.submitter.email;
-                }
-            );
-        },
         check_assessor: function (proposal) {
             let vm = this;
             if (proposal.assigned_officer) {
@@ -646,7 +633,6 @@ export default {
             vm.initialiseScientificNameLookup();
             vm.initialiseCommunityNameLookup();
             vm.addEventListeners();
-            vm.initialiseSearch();
             // -- to set the select2 field with the session value if exists onload()
             if (sessionStorage.getItem("filterCSScientificName") != 'all' && sessionStorage.getItem("filterCSScientificName") != null) {
                 // contructor new Option(text, value, defaultSelected, selected)
diff --git a/boranga/frontend/boranga/src/components/external/occurrence/occurrence_report_proposal.vue b/boranga/frontend/boranga/src/components/external/occurrence/occurrence_report_proposal.vue
index e2b401ca3..f203f8bd6 100644
--- a/boranga/frontend/boranga/src/components/external/occurrence/occurrence_report_proposal.vue
+++ b/boranga/frontend/boranga/src/components/external/occurrence/occurrence_report_proposal.vue
@@ -219,9 +219,14 @@ export default {
                 payload.action = 'submit';
             }
             const res = await vm.$http.post(vm.ocr_proposal_form_url, payload).then(res => {
+                let swalHtml = '<p>Your occurrence report has been saved as a draft.</p>';
+                if (vm.saveExitOCRProposal) {
+                    swalHtml += '<p>It has <span class="fw-bold">NOT</span> been submitted.</p><p>You can find the draft on the occurrence report dashboard to continue working on the report later.</p>'
+                }
+
                 swal.fire({
-                    title: 'Saved',
-                    text: 'Your report has been saved',
+                    title: 'Occurrence Report Saved',
+                    html: swalHtml,
                     icon: 'success',
                     buttonsStyling: false,
                     customClass: {
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue b/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
index ccc2b03ce..9bb3ace16 100644
--- a/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
@@ -32,7 +32,7 @@
                                     v-model="species_community.publishing_status.conservation_status_public">
                             </div>
                         </div>
-                        <div class="row mb-3">
+                        <!-- <div class="row mb-3">
                             <label for="conservation_attributes_publishing" class="col-sm-6 control-label">Conservation
                                 Attributes: </label>
                             <div class="col-sm-6">
@@ -45,7 +45,7 @@
                                     id="conservation_attributes_publishing"
                                     v-model="species_community.publishing_status.conservation_attributes_public">
                             </div>
-                        </div>
+                        </div> -->
                         <div class="row mb-3">
                             <label for="threats_publishing" class="col-sm-6 control-label">Threats: </label>
                             <div class="col-sm-6">
diff --git a/boranga/migrations/0428_alter_community_options_and_more.py b/boranga/migrations/0428_alter_community_options_and_more.py
new file mode 100644
index 000000000..3b3d028c0
--- /dev/null
+++ b/boranga/migrations/0428_alter_community_options_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.8 on 2024-08-27 06:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0427_alter_community_renamed_from_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="community",
+            options={"verbose_name_plural": "communities"},
+        ),
+    ]
diff --git a/boranga/migrations/0429_alter_community_renamed_from_and_more.py b/boranga/migrations/0429_alter_community_renamed_from_and_more.py
new file mode 100644
index 000000000..94423538b
--- /dev/null
+++ b/boranga/migrations/0429_alter_community_renamed_from_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.0.8 on 2024-08-27 08:17
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0428_alter_community_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="community",
+            name="renamed_from",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="renamed_to",
+                to="boranga.community",
+            ),
+        ),
+    ]