diff --git a/client/src/views/sock-history.vue b/client/src/views/sock-history.vue
index 051718f..6b1c212 100644
--- a/client/src/views/sock-history.vue
+++ b/client/src/views/sock-history.vue
@@ -24,16 +24,16 @@
                 >
                 <v-card-text
                   ><v-icon large class="mr-2">{{
-                    getIconForAType(i.aType)
+                    getIconForAType(i.sockType)
                   }}</v-icon
-                  >{{ getNameForType(i.aType) }}
+                  >{{ getNameForType(i.sockType) }}
                   <div v-if="i.textra" class="mt-4">{{ i.textra }}</div>
                 </v-card-text>
                 <v-card-actions>
                   <v-btn text @click="openHistoryOfItem(i)">{{
                     $sock.t("History")
                   }}</v-btn>
-                  <v-btn v-if="canOpen(i.aType)" text @click="openItem(i)">{{
+                  <v-btn v-if="canOpen(i.sockType)" text @click="openItem(i)">{{
                     $sock.t("Open")
                   }}</v-btn>
                 </v-card-actions>
@@ -58,9 +58,9 @@
                 >
                 <v-card-text
                   ><v-icon large class="mr-2">{{
-                    getIconForAType(i.aType)
+                    getIconForAType(i.sockType)
                   }}</v-icon
-                  >{{ getNameForType(i.aType) }}
+                  >{{ getNameForType(i.sockType) }}
                   <div v-if="i.textra" class="mt-4">{{ i.textra }}</div>
                 </v-card-text>
 
@@ -146,7 +146,7 @@ export default {
         });
       } else {
         window.$gz.eventBus.$emit("openobject", {
-          type: item.aType,
+          type: item.sockType,
           id: item.objectId
         });
       }
@@ -162,7 +162,7 @@ export default {
       } else {
         this.$router.push({
           name: "sock-history",
-          params: { socktype: item.aType, recordid: item.objectId }
+          params: { socktype: item.sockType, recordid: item.objectId }
         });
       }
     },
diff --git a/server/DataList/EventDataList.cs b/server/DataList/EventDataList.cs
index 84a218a..c68c0b4 100644
--- a/server/DataList/EventDataList.cs
+++ b/server/DataList/EventDataList.cs
@@ -31,7 +31,7 @@ namespace Sockeye.DataList
                 FieldKey = "event",
                 UiFieldDataType = (int)UiFieldDataType.Enum,
                 EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(SockEvent).ToString()),
-                SqlValueColumnName = "aevent.ayevent"
+                SqlValueColumnName = "aevent.sockevent"
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition
@@ -48,8 +48,8 @@ namespace Sockeye.DataList
                 TKey = "Object",
                 FieldKey = "object",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "aevent.ayid",
-                SqlValueColumnName = $"AYGETNAME(aevent.ayid, aevent.socktype,{translationId})",
+                SqlIdColumnName = "aevent.sockid",
+                SqlValueColumnName = $"AYGETNAME(aevent.sockid, aevent.socktype,{translationId})",
                 SqlATypeColumnName = "aevent.socktype"
             });
 
diff --git a/server/biz/Search.cs b/server/biz/Search.cs
index 4c887c1..26c24cf 100644
--- a/server/biz/Search.cs
+++ b/server/biz/Search.cs
@@ -120,7 +120,7 @@ namespace Sockeye.Biz
             var qTypeOnly=string.Empty;
             if(searchParameters.TypeOnly!=SockType.NoType){
                 //INNER JOIN ASEARCHKEY ON ASEARCHDICTIONARY.ID = ASEARCHKEY.WORDID and asearchkey.sockType=20
-                qTypeOnly=$"AND ASEARCHKEY.ATYPE={(int)searchParameters.TypeOnly}";
+                qTypeOnly=$"AND ASEARCHKEY.SOCKTYPE={(int)searchParameters.TypeOnly}";
             }
 
             q.Append($" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid {qTypeOnly} GROUP BY asearchkey.objectid, asearchkey.sockType) SELECT sockType, objectid FROM qr WHERE ");
@@ -634,7 +634,7 @@ namespace Sockeye.Biz
         {
             //Be careful in future, if you put ToString at the end of each object in the string interpolation
             //npgsql driver will assume it's a string and put quotes around it triggering an error that a string can't be compared to an int
-            await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and aType={(int)aType}");
+            await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and socktype={(int)aType}");
             //nothing to save here, it's a direct command already executed
         }