diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index 3230bc2de1aa82754770364457fda657e7db3279..8da93ba40f621cea1db4e46414fd28ef77856fc4 100644
Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ
diff --git a/dbrepo-ui/components/dialogs/Semantics.vue b/dbrepo-ui/components/dialogs/Semantics.vue
index ff59effa956f6b9ed1bea61ec9bec5f92bd76312..5c028cbcb68c6390234127e568096bf3ab1d70b6 100644
--- a/dbrepo-ui/components/dialogs/Semantics.vue
+++ b/dbrepo-ui/components/dialogs/Semantics.vue
@@ -55,6 +55,7 @@
           v-if="recommendations.length === 0">
           <v-col>
             <v-btn
+              v-if="finishedRecommendations"
               color="secondary"
               variant="flat"
               size="small"
@@ -165,6 +166,7 @@ export default {
       uri: null,
       valid: false,
       loading: false,
+      finishedRecommendations: false,
       loadingOntologies: false,
       loadingSemantics: false,
       cacheStore: useCacheStore()
@@ -172,7 +174,7 @@ export default {
   },
   computed: {
     title () {
-      return this.$t('pages.table.subpages.semantics.title') + ' ' +  this.column.internal_name
+      return this.$t('pages.table.subpages.semantics.title', { type: this.mode }) + ' ' +  this.column.internal_name
     },
     ontologies () {
       return this.cacheStore.getOntologies.filter(o => o.sparql || o.rdf)
@@ -243,6 +245,13 @@ export default {
             action: 'assign'
           })
         })
+        .catch(({code, message}) => {
+          const toast = useToastInstance()
+          if (typeof code !== 'string') {
+            return
+          }
+          toast.error(message)
+        })
         .finally(() => {
           this.recommendation = null
           this.$refs.form.reset()
@@ -255,10 +264,14 @@ export default {
       tableService.suggest(this.database.id, this.tableId, this.column.id)
         .then((recommendations) => {
           this.recommendations = recommendations
+          this.finishedRecommendations = true
         })
-        .catch((error) => {
+        .catch(({code, message}) => {
           const toast = useToastInstance()
-          toast.error(this.$t('error.semantics.timeout'))
+          if (typeof code !== 'string') {
+            return
+          }
+          toast.error(message)
         })
         .finally(() => {
           this.loadingSemantics = false
diff --git a/dbrepo-ui/components/table/TableHistory.vue b/dbrepo-ui/components/table/TableHistory.vue
index ccc270c46c22de4933c76a448a9e7db95a2f6a10..c0e2bd7c7aa133fbf4afa64a5d46195f93a8e4fa 100644
--- a/dbrepo-ui/components/table/TableHistory.vue
+++ b/dbrepo-ui/components/table/TableHistory.vue
@@ -167,8 +167,8 @@ export default {
             // labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss.SSS')) : [],
             labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss')) : [],
             datasets: [
-              { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.filterHistoryEventType(history, 'INSERT') },
-              { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.filterHistoryEventType(history, 'DELETE') }
+              { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.filterHistoryEventType(history, 'insert') },
+              { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.filterHistoryEventType(history, 'delete') }
             ]
           }
         })
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index c3da75d79b5462bd088844e35580413b02e46e9a..a42a56411b825f5eb011b311ce995e9f291c7725 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -541,7 +541,7 @@
           }
         },
         "semantics": {
-          "title": "Assign semantic instance for table column",
+          "title": "Assign semantic {type} for table column",
           "subtitle": "Semantic instances help machines to get the proper context of your dataset",
           "recommended": "Recommended semantic instances",
           "bullet": "●",
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index 3230bc2de1aa82754770364457fda657e7db3279..8da93ba40f621cea1db4e46414fd28ef77856fc4 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ