diff --git a/src/main/java/no/nibio/vips/logic/entity/Observation.java b/src/main/java/no/nibio/vips/logic/entity/Observation.java
index 7d5a506af769de9b0a6b22a80ae92c1e0c6441e1..b0b092d053042e9187d30be2022dd9108e84cc7f 100755
--- a/src/main/java/no/nibio/vips/logic/entity/Observation.java
+++ b/src/main/java/no/nibio/vips/logic/entity/Observation.java
@@ -471,7 +471,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
     @Column(name = "observation_data")
     @Override
     public String getObservationData() {
-        return observationData;
+        return this.observationData != null && this.observationData.replaceAll("\"", "").trim().length() > 0 ? this.observationData : null;
     }
 
     /**
diff --git a/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java b/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
index 425fd96c1714ce6c81c17694a4ceba28eebca450..33aaf8a0e4d5dcbe88baf9394b921bed4de517c0 100755
--- a/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
+++ b/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
@@ -276,6 +276,10 @@ public class PointOfInterest implements Serializable, Comparable {
         {
             this.properties.put("pointOfInterestTypeId", this.getPointOfInterestTypeId());
         }
+        if(this.properties.get("pointOfInterestName") == null)
+        {
+            this.properties.put("pointOfInterestName", this.getName());
+        }
         return this.properties;
     }
 
diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
index be9bc11cda555726f828c73e5f3e31b4c5de2a66..2a0ee7e8998b57b5e656761ad98823f8488e0f79 100644
--- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
@@ -287,7 +287,9 @@ public class BarkbeetleBean {
         em.createNativeQuery("DELETE FROM barkbeetle.season_trapsite_bivolt WHERE season_trapsite_id = :seasonTrapsiteId")
                 .setParameter("seasonTrapsiteId", seasonTrapsiteId)
                 .executeUpdate();
-        em.remove(stToDelete);
+        em.createNativeQuery("DELETE FROM barkbeetle.season_trapsite WHERE season_trapsite_id = :seasonTrapsiteId")
+                .setParameter("seasonTrapsiteId", seasonTrapsiteId)
+                .executeUpdate();
         return true;
     }
 
diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
index a0308ccfff090314e918462415b4053a7e3e5431..7e622af69015be444556ca0982e740e9f9ffa03d 100644
--- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
@@ -60,7 +60,7 @@ import org.locationtech.jts.geom.Point;
 public class BarkbeetleController extends HttpServlet {
     
 	// Due to version controls of PDF files, we keep the file names globally updated here
-	public final static String FILENAME_INSTRUKS_REGISTRANTER = "Instruks_registranter_i_Barkbilleovervakingen_2024-03-04.pdf";
+	public final static String FILENAME_INSTRUKS_REGISTRANTER = "Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf";
 	public final static String FILENAME_INSTRUKS_BARKBILLEFYLKESKONTAKTER = "Instruks_Barkbillefylkeskontakter_2024-03-04.pdf";
 	public final static String FILENAME_KJENN_IGJEN_ANGREP = "Kjenn_igjen_angrep_stor_granbarkbille_2022-04-25.pdf";
         
diff --git a/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java b/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java
index 3918f9d8f93a91c3bebe1e22e19778e5aa5b382e..9d3583ca3b2b47a8a6733f67ab485a6c00d6d788 100755
--- a/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java
+++ b/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java
@@ -33,7 +33,7 @@ public class HierarchyCategoryLocaleNames {
     
     public String getName(Integer hierarchyCategoryId)
     {
-        return this.nameMap.get(hierarchyCategoryId);
+        return this.nameMap.get(hierarchyCategoryId) != null ? this.nameMap.get(hierarchyCategoryId) : "";
     }
     
     public List<Integer> getHierarchyCategoryIds()
diff --git a/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e8c2c65b190d05af711ac1f8f94af176201b74ff
Binary files /dev/null and b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf differ
diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl
index 43590675ff00a49c696e16e6595b71d55c3603df..d34ca3f43e38262ce05a66206edcf711a92d0d25 100755
--- a/src/main/webapp/templates/observationForm.ftl
+++ b/src/main/webapp/templates/observationForm.ftl
@@ -447,8 +447,9 @@
                 </#if>
                 var cropList = [
                     <#if ! observation.observationId?has_content || user.isSuperUser() || user.isOrganizationAdmin()>
+                        {organismId: -10, displayName: "${i18nBundle.missingInDatabase}", hierarchyCategoryId: -1},
                         <#list allCrops as cropOrganism>
-                        {organismId: ${cropOrganism.organismId}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId}}<#sep>,
+                        {organismId: ${cropOrganism.organismId?c}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId!"-1"}}<#sep>,
                         </#list>
                     <#else>
                         <#list allCrops as cropOrganism>