diff --git a/src/components/MapObservation.vue b/src/components/MapObservation.vue
index 4f8912fcb1453a7a3b2ab5c9abc21d503643d28a..018d04eae1ab488a61fdd4d79f62723882a92c57 100644
--- a/src/components/MapObservation.vue
+++ b/src/components/MapObservation.vue
@@ -506,20 +506,7 @@ export default {
         {
             this.isMyMapPanelVisible = this.isMapPanelVisible;
         }
-        if(routeParam.observationText)
-        {
-            this.mapObservation.observationText=routeParam.observationText
-        }
-        if(routeParam.observationHeader)
-        {
-            this.mapObservation.observationHeader=routeParam.observationHeader;
-        }
-		if(routeParam.timeOfObservation)
-		{
-			this.mapObservation.timeOfObservation = routeParam.timeOfObservation;
-		}
-
-
+        
         if(this.isMyMapPanelVisible)
             {
                 mapDiv.style.height = (screen.height - navDiv.offsetHeight) + "px";
diff --git a/src/components/Observation.vue b/src/components/Observation.vue
index 87975a260ec6bf35dfe782b8cac3b994a38d8570..34b10d444efdb1a81ae02b63488e4c73f3a05152 100644
--- a/src/components/Observation.vue
+++ b/src/components/Observation.vue
@@ -90,8 +90,8 @@
 
       <div ref='divObservationText' class="form-group">
         <div><font-awesome-icon icon="fa-regular fa-file-lines" style="font-size: x-large;"/></div>
-        <div><input ref="observationHeader" type="text" class="form-control" v-model="observationHeader" :placeholder="$t('observation.detail.heading.placeholder')"/></div>
-        <div><textarea v-model="observationText" class="form-control" rows="4" :placeholder="$t('observation.detail.body.placeholder')"/></div>
+        <div><input ref="observationHeader" type="text" class="form-control" v-model="observation.observationHeading" :placeholder="$t('observation.detail.heading.placeholder')"/></div>
+        <div><textarea v-model="observation.observationText" class="form-control" rows="4" :placeholder="$t('observation.detail.body.placeholder')"/></div>
       </div>
         <!--div v-show="isSync"><sync ref="sync" :isSyncNeeded="isSync"/></div-->
 
@@ -142,8 +142,6 @@ export default {
       strDateObservation              : null,
       maxObservationDate              : null,
       minObservationDate              : null,
-      observationHeader               : '',
-      observationText                 : '',
       mapGeoinfo                      : null,
       mapLocationPointOfInterestId    : '',
       isMapPanelVisible               : false,
@@ -258,7 +256,7 @@ export default {
 			result = false;
           }
 
-          if(!this.observationHeader) 
+          if(!this.observation.observationHeading) 
           {
 			msg += this.$i18n.t("err.observation.header.empty") + "\n";
 			result = false;
@@ -325,9 +323,7 @@ export default {
                 /* For related Pest and Pest list */
                 this.getObservationPests(jsonObservation);
 
-                this.strDateObservation = DateTime.fromISO(jsonObservation.timeOfObservation).toFormat('yyyy-MM-dd\'T\'HH:mm:ss');
-                this.observationHeader  =  jsonObservation.observationHeading;
-                this.observationText    =   jsonObservation.observationText;                
+                this.strDateObservation = DateTime.fromISO(jsonObservation.timeOfObservation).toFormat('yyyy-MM-dd\'T\'HH:mm:ss');             
               }
 
               if(this.paramGeoinfo)
@@ -639,8 +635,8 @@ export default {
           this.observationForStore.locationPointOfInterestId  = this.observation.locationPointOfInterestId;
           this.observationForStore.broadcastMessage           = this.observation.broadcastMessage;
           this.observationForStore.statusRemarks              = this.observation.statusRemarks;
-          this.observationForStore.observationHeading         = this.observationHeader;
-          this.observationForStore.observationText            = this.observationText;
+          this.observationForStore.observationHeading         = this.observation.observationHeading;
+          this.observationForStore.observationText            = this.observation.observationText;
           this.observationForStore.observationData            = JSON.stringify(this.observation.observationData)//'{"number":0,"unit":"Number"}'; //"{\"number\":0,\"unit\":\"Number\"}"; 
           this.observationForStore.observationIllustrationSet = this.observation.observationIllustrationSet;
 
@@ -787,15 +783,6 @@ export default {
     if(this.paramObservation)
     {
         this.observation  = this.paramObservation;
-
-        if(this.paramObservation.observationText)
-        {
-          this.observationText = this.paramObservation.observationText;
-        }
-        if(this.paramObservation.observationHeader)
-        {
-          this.observationHeader = this.paramObservation.observationHeader;
-        }
     }
     if(this.paramGeoinfo)
     {