diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index d0b9686d7c..e458428b3f 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -186,6 +186,18 @@ function scrollToComment(commentId: string) {
   }
 }
 
+function scrollToAudit(auditId?: string) {
+  if (!auditId) return
+
+  const auditEl = commentsWrapperEl.value?.querySelector(`.nc-audit-item.${auditId}`)
+  if (auditEl) {
+    auditEl.scrollIntoView({
+      behavior: 'smooth',
+      block: 'center',
+    })
+  }
+}
+
 watch(commentsWrapperEl, () => {
   setTimeout(() => {
     nextTick(() => {
@@ -261,6 +273,17 @@ function handleResetHoverEffect() {
 
   hoveredCommentId.value = null
 }
+
+watch(
+  () => audits.value.length,
+  (auditCount) => {
+    nextTick(() => {
+      setTimeout(() => {
+        scrollToAudit(audits.value[auditCount - 1]?.id)
+      }, 100)
+    })
+  },
+)
 </script>
 
 <template>
@@ -530,7 +553,7 @@ function handleResetHoverEffect() {
               </div>
             </template>
 
-            <div v-for="audit of audits" :key="audit.id" class="nc-audit-item">
+            <div v-for="audit of audits" :key="audit.id" :class="`${audit.id}`" class="nc-audit-item">
               <div class="group gap-3 overflow-hidden px-3 py-2 hover:bg-gray-100">
                 <div class="flex items-start justify-between">
                   <div class="flex items-start gap-3 flex-1 w-full">
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index f03bb9d7c7..f926ca0d5e 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -315,7 +315,9 @@ const reloadHook = createEventHook()
 reloadHook.on(() => {
   reloadParentRowHook?.trigger({ shouldShowLoading: false })
   if (isNew.value) return
-  _loadRow(null, true)
+
+  _loadRow(undefined, true)
+  loadAudits(rowId.value, false)
 })
 provide(ReloadRowDataHookInj, reloadHook)
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue
index 4c4fa74b9f..b77432fc0a 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { isSystemColumn, type ColumnType } from 'nocodb-sdk'
+import { type ColumnType, isSystemColumn } from 'nocodb-sdk'
 
 const props = defineProps<{
   // As we need to focus search box when the parent is opened
@@ -13,21 +13,14 @@ const props = defineProps<{
 
 const emits = defineEmits<{ selected: [ColumnType] }>()
 
-const {
-  isParentOpen,
-  toolbarMenu,
-  searchInputPlaceholder,
-  selectedOptionId,
-  options: _options,
-  showSelectedOption,
-} = toRefs(props)
+const { isParentOpen, toolbarMenu, searchInputPlaceholder, selectedOptionId, showSelectedOption } = toRefs(props)
 
 const { fieldsMap } = useViewColumnsOrThrow()
 
 const searchQuery = ref('')
 
 const options = computed(() =>
-  (_options.value || [])
+  (props.options || [])
     .map((c) => c)
     .sort((field1, field2) => {
       // sort by view column order and keep system columns at the end
diff --git a/packages/nc-gui/components/workspace/AuditLogs.vue b/packages/nc-gui/components/workspace/AuditLogs.vue
index e90af31be9..1da3fec6de 100644
--- a/packages/nc-gui/components/workspace/AuditLogs.vue
+++ b/packages/nc-gui/components/workspace/AuditLogs.vue
@@ -476,7 +476,7 @@ useEventListener(tableWrapper, 'scroll', () => {
             </div>
           </div>
         </template>
-        <div v-if="selectedAudit" class="flex flex-col gap-4">
+        <div v-if="selectedAudit" class="nc-expanded-audit flex flex-col gap-4">
           <div class="bg-gray-50 rounded-lg border-1 border-gray-200">
             <div class="flex">
               <div class="w-1/2 border-r border-gray-200 flex flex-col gap-2 px-4 py-3">
@@ -548,7 +548,9 @@ useEventListener(tableWrapper, 'scroll', () => {
           </div>
           <div class="flex flex-col gap-2">
             <div class="cell-header">{{ $t('labels.description') }}</div>
-            <div class="text-small leading-[18px] text-gray-600">{{ selectedAudit?.description }}</div>
+            <div>
+              <pre class="!text-small !leading-[18px] !text-gray-600 mb-0">{{ selectedAudit?.description }}</pre>
+            </div>
           </div>
         </div>
       </NcModal>
@@ -557,13 +559,9 @@ useEventListener(tableWrapper, 'scroll', () => {
 </template>
 
 <style lang="scss" scoped>
-.nc-audit-table pre {
-  display: table;
-  table-layout: fixed;
-  width: 100%;
-  white-space: break-spaces;
-  font-size: unset;
-  font-family: unset;
+.nc-expanded-audit pre {
+  font-family: Manrope, 'Inter', 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+    sans-serif;
 }
 
 :deep(.nc-menu-item-inner) {
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 150c1eb2e6..5c7674b0b5 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -173,7 +173,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     }
   }
 
-  const loadAudits = async (_rowId?: string) => {
+  const loadAudits = async (_rowId?: string, showLoading: boolean = true) => {
     if (!isUIAllowed('auditListRow') || isEeUI || (!row.value && !_rowId)) return
 
     const rowId = _rowId ?? extractPkFromRow(row.value.row, meta.value.columns as ColumnType[])
@@ -181,7 +181,9 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     if (!rowId) return
 
     try {
-      isAuditLoading.value = true
+      if (showLoading) {
+        isAuditLoading.value = true
+      }
       const res =
         (
           await $api.utils.auditList({
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index af391fe04d..2292f0cabb 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -1172,7 +1172,7 @@ export function useMultiSelect(
 
             for (const col of cols) {
               if (!col.title || !isPasteable(row, col)) {
-                if ((isBt(col) || isOo(pasteCol) || isMm(col)) && !isInfoShown) {
+                if ((isBt(col) || isOo(col) || isMm(col)) && !isInfoShown) {
                   message.info(t('msg.info.groupPasteIsNotSupportedOnLinksColumn'))
                   isInfoShown = true
                 }
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 4042839016..f49561788b 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -231,10 +231,12 @@ class BaseModelSqlv2 {
       ignoreView = false,
       getHiddenColumn = false,
       throwErrorIfInvalidParams = false,
+      extractOnlyPrimaries = false,
     }: {
       ignoreView?: boolean;
       getHiddenColumn?: boolean;
       throwErrorIfInvalidParams?: boolean;
+      extractOnlyPrimaries?: boolean;
     } = {},
   ): Promise<any> {
     const qb = this.dbDriver(this.tnPath);
@@ -247,6 +249,7 @@ class BaseModelSqlv2 {
         : this.viewId && (await View.get(this.context, this.viewId)),
       getHiddenColumn,
       throwErrorIfInvalidParams,
+      extractOnlyPrimaries,
     });
 
     await this.selectObject({
@@ -281,6 +284,54 @@ class BaseModelSqlv2 {
     return data ? await nocoExecute(ast, data, {}, parsedQuery) : null;
   }
 
+  public async readByPkFromModel(
+    model = this.model,
+    viewId?: string,
+    extractDisplayValueData?: boolean,
+    ...rest: Parameters<BaseModelSqlv2['readByPk']>
+  ): Promise<any> {
+    let data;
+    if (this.model.id === model.id) {
+      data = await this.readByPk(...rest);
+    } else {
+      const baseModel = await Model.getBaseModelSQL(this.context, {
+        model,
+        viewId: viewId,
+        dbDriver: this.dbDriver,
+      });
+
+      data = await baseModel.readByPk(...rest);
+    }
+
+    if (extractDisplayValueData) {
+      return data ? data[model.displayValue.title] ?? null : '';
+    }
+
+    return data;
+  }
+
+  public async readOnlyPrimariesByPkFromModel(
+    props: { model: Model; id: any; extractDisplayValueData?: boolean }[],
+  ): Promise<any[]> {
+    return await Promise.all(
+      props.map(({ model, id, extractDisplayValueData = true }) =>
+        this.readByPkFromModel(
+          model,
+          undefined,
+          extractDisplayValueData,
+          id,
+          false,
+          {},
+          {
+            ignoreView: true,
+            getHiddenColumn: true,
+            extractOnlyPrimaries: true,
+          },
+        ),
+      ),
+    );
+  }
+
   public async exist(id?: any): Promise<any> {
     const qb = this.dbDriver(this.tnPath);
     await this.model.getColumns(this.context);
@@ -3703,6 +3754,19 @@ class BaseModelSqlv2 {
 
       await this.prepareNocoData(updateObj, false, cookie);
 
+      const btForeignKeyColumn = columns.find(
+        (c) =>
+          c.uidt === UITypes.ForeignKey && data[c.column_name] !== undefined,
+      );
+
+      const btColumn = btForeignKeyColumn
+        ? columns.find(
+            (c) =>
+              c.uidt === UITypes.LinkToAnotherRecord &&
+              c.colOptions?.fk_child_column_id === btForeignKeyColumn.id,
+          )
+        : null;
+
       const prevData = await this.readByPk(
         id,
         false,
@@ -3730,7 +3794,19 @@ class BaseModelSqlv2 {
         {},
         { ignoreView: true, getHiddenColumn: true },
       );
-      await this.afterUpdate(prevData, newData, trx, cookie, updateObj);
+
+      if (btColumn && Object.keys(data || {}).length === 1) {
+        await this.addChild({
+          colId: btColumn.id,
+          rowId: id,
+          childId: updateObj[btForeignKeyColumn.title],
+          cookie,
+          onlyUpdateAuditLogs: true,
+          prevData,
+        });
+      } else {
+        await this.afterUpdate(prevData, newData, trx, cookie, updateObj);
+      }
       return newData;
     } catch (e) {
       await this.errorUpdate(e, data, trx, cookie);
@@ -5024,6 +5100,34 @@ class BaseModelSqlv2 {
   public async afterInsert(data: any, _trx: any, req): Promise<void> {
     await this.handleHooks('after.insert', null, data, req);
     const id = this._extractPksValues(data);
+
+    let details = '';
+
+    if (data && typeof data === 'object') {
+      const updateObj = await this.model.mapColumnToAlias(
+        this.context,
+        data,
+        this.model.columns?.filter((c) => !c.pk && !isSystemColumn(c)),
+      );
+
+      for (const k of Object.keys(updateObj)) {
+        if (
+          updateObj[k] === null ||
+          updateObj[k] === undefined ||
+          (typeof updateObj[k] === 'string' && updateObj[k] === '')
+        ) {
+          continue;
+        }
+
+        const newValue =
+          typeof updateObj[k] === 'object'
+            ? JSON.stringify(updateObj[k])
+            : updateObj[k];
+        details += DOMPurify.sanitize(`<span class="">${k}</span>
+          : <span class="black--text green lighten-4 px-2">${newValue}</span>`);
+      }
+    }
+
     await Audit.insert({
       fk_workspace_id: this.model.fk_workspace_id,
       base_id: this.model.base_id,
@@ -5035,7 +5139,7 @@ class BaseModelSqlv2 {
       description: DOMPurify.sanitize(
         `Record with ID ${id} has been inserted into Table ${this.model.title}`,
       ),
-      // details: JSON.stringify(data),
+      details: details || null,
       ip: req?.clientIp,
       user: req?.user?.email,
     });
@@ -5147,6 +5251,7 @@ class BaseModelSqlv2 {
     let details = '';
     if (updateObj) {
       updateObj = await this.model.mapColumnToAlias(this.context, updateObj);
+
       for (const k of Object.keys(updateObj)) {
         const prevValue =
           typeof prevData[k] === 'object'
@@ -5385,11 +5490,15 @@ class BaseModelSqlv2 {
     rowId,
     childId,
     cookie,
+    onlyUpdateAuditLogs,
+    prevData,
   }: {
     colId: string;
     rowId: string;
     childId: string;
     cookie?: any;
+    onlyUpdateAuditLogs?: boolean;
+    prevData?: Record<string, any>;
   }) {
     const columns = await this.model.getColumns(this.context);
     const column = columns.find((c) => c.id === colId);
@@ -5404,6 +5513,11 @@ class BaseModelSqlv2 {
       this.context,
     );
 
+    // return if onlyUpdateAuditLogs is true and is not bt column
+    if (onlyUpdateAuditLogs && colOptions.type !== RelationTypes.BELONGS_TO) {
+      return;
+    }
+
     const childColumn = await colOptions.getChildColumn(this.context);
     const parentColumn = await colOptions.getParentColumn(this.context);
     const parentTable = await parentColumn.getModel(this.context);
@@ -5413,13 +5527,54 @@ class BaseModelSqlv2 {
 
     const childTn = this.getTnPath(childTable);
     const parentTn = this.getTnPath(parentTable);
-    const prevData = await this.readByPk(
-      rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
+
+    const relatedChildCol = getRelatedLinksColumn(
+      column,
+      this.model.id === parentTable.id ? childTable : parentTable,
     );
 
+    const auditUpdateObj = [] as {
+      rowId: string;
+      childId: string;
+      model: Model;
+      childModel: Model;
+      op_sub_type:
+        | AuditOperationSubTypes.LINK_RECORD
+        | AuditOperationSubTypes.UNLINK_RECORD;
+      columnTitle: string;
+      pkValue?: Record<string, any>;
+    }[];
+
+    const auditConfig = {
+      childModel: childTable,
+      parentModel: parentTable,
+      childColTitle: relatedChildCol?.title || '',
+      parentColTitle: column.title,
+    } as {
+      childModel: Model;
+      parentModel: Model;
+      childColTitle: string;
+      parentColTitle: string;
+    };
+
+    const triggerAfterRemoveChild = async () => {
+      await Promise.allSettled(
+        auditUpdateObj
+          .filter((a) => a.op_sub_type === AuditOperationSubTypes.UNLINK_RECORD)
+          .map((updateObj) => {
+            this.afterRemoveChild(
+              updateObj.columnTitle,
+              updateObj.rowId,
+              updateObj.childId,
+              cookie,
+              updateObj.model,
+              updateObj.childModel,
+              updateObj.pkValue,
+            );
+          }),
+      );
+    };
+
     switch (colOptions.type) {
       case RelationTypes.MANY_TO_MANY:
         {
@@ -5475,10 +5630,57 @@ class BaseModelSqlv2 {
             rowIds: [rowId],
             cookie,
           });
+
+          auditConfig.parentModel =
+            this.model.id === parentTable.id ? parentTable : childTable;
+          auditConfig.childModel =
+            this.model.id === parentTable.id ? childTable : parentTable;
         }
         break;
       case RelationTypes.HAS_MANY:
         {
+          const linkedHmRowObj = await this.execAndParse(
+            this.dbDriver(childTn)
+              .select(`${childTable.table_name}.${childColumn.column_name}`)
+              .where(_wherePk(childTable.primaryKeys, childId)),
+            null,
+            { raw: true, first: true },
+          );
+
+          const oldRowId = linkedHmRowObj
+            ? Object.values(linkedHmRowObj)?.[0]
+            : null;
+
+          if (oldRowId) {
+            const [parentRelatedPkValue, childRelatedPkValue] =
+              await this.readOnlyPrimariesByPkFromModel([
+                { model: childTable, id: childId },
+                { model: parentTable, id: oldRowId },
+              ]);
+
+            auditUpdateObj.push({
+              model: auditConfig.parentModel,
+              childModel: auditConfig.childModel,
+              rowId: oldRowId as string,
+              childId,
+              op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+              columnTitle: auditConfig.parentColTitle,
+              pkValue: parentRelatedPkValue,
+            });
+
+            if (parentTable.id !== childTable.id) {
+              auditUpdateObj.push({
+                model: auditConfig.childModel,
+                childModel: auditConfig.parentModel,
+                rowId: childId,
+                childId: oldRowId as string,
+                op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                columnTitle: auditConfig.childColTitle,
+                pkValue: childRelatedPkValue,
+              });
+            }
+          }
+
           await this.execAndParse(
             this.dbDriver(childTn)
               .update({
@@ -5494,6 +5696,7 @@ class BaseModelSqlv2 {
             null,
             { raw: true },
           );
+          await triggerAfterRemoveChild();
 
           await this.updateLastModified({
             model: parentTable,
@@ -5504,32 +5707,318 @@ class BaseModelSqlv2 {
         break;
       case RelationTypes.BELONGS_TO:
         {
-          await this.execAndParse(
-            this.dbDriver(childTn)
-              .update({
+          auditConfig.parentModel = childTable;
+          auditConfig.childModel = parentTable;
+
+          if (onlyUpdateAuditLogs) {
+            const oldChildRowId = prevData[column.title]
+              ? getCompositePkValue(
+                  parentTable.primaryKeys,
+                  this._extractPksValues(prevData[column.title]),
+                )
+              : null;
+
+            if (oldChildRowId) {
+              auditUpdateObj.push({
+                model: auditConfig.parentModel,
+                childModel: auditConfig.childModel,
+                rowId,
+                childId: oldChildRowId as string,
+                op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                columnTitle: auditConfig.parentColTitle,
+                pkValue:
+                  prevData[column.title]?.[parentTable.displayValue.title] ??
+                  null,
+              });
+
+              const [childRelatedPkValue] =
+                await this.readOnlyPrimariesByPkFromModel([
+                  { model: childTable, id: rowId },
+                ]);
+
+              if (parentTable.id !== childTable.id) {
+                auditUpdateObj.push({
+                  model: auditConfig.childModel,
+                  childModel: auditConfig.parentModel,
+                  rowId: oldChildRowId as string,
+                  childId: rowId,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.childColTitle,
+                  pkValue: childRelatedPkValue,
+                });
+              }
+            }
+            await triggerAfterRemoveChild();
+          } else {
+            const linkedHmRowObj = await this.execAndParse(
+              this.dbDriver(childTn)
+                .select(childColumn.column_name)
+                .where(_wherePk(childTable.primaryKeys, rowId)),
+              null,
+              { raw: true, first: true },
+            );
+
+            const oldChildRowId = linkedHmRowObj
+              ? Object.values(linkedHmRowObj)?.[0]
+              : null;
+
+            if (oldChildRowId) {
+              const [parentRelatedPkValue, childRelatedPkValue] =
+                await this.readOnlyPrimariesByPkFromModel([
+                  { model: parentTable, id: oldChildRowId },
+                  { model: childTable, id: rowId },
+                ]);
+
+              auditUpdateObj.push({
+                model: auditConfig.parentModel,
+                childModel: auditConfig.childModel,
+                rowId,
+                childId: oldChildRowId as string,
+                op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                columnTitle: auditConfig.parentColTitle,
+                pkValue: parentRelatedPkValue,
+              });
+
+              if (parentTable.id !== childTable.id) {
+                auditUpdateObj.push({
+                  model: auditConfig.childModel,
+                  childModel: auditConfig.parentModel,
+                  rowId: oldChildRowId as string,
+                  childId: rowId,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.childColTitle,
+                  pkValue: childRelatedPkValue,
+                });
+              }
+            }
+
+            await this.execAndParse(
+              this.dbDriver(childTn)
+                .update({
+                  [childColumn.column_name]: this.dbDriver.from(
+                    this.dbDriver(parentTn)
+                      .select(parentColumn.column_name)
+                      .where(_wherePk(parentTable.primaryKeys, childId))
+                      .first()
+                      .as('___cn_alias'),
+                  ),
+                })
+                .where(_wherePk(childTable.primaryKeys, rowId)),
+              null,
+              { raw: true },
+            );
+
+            await triggerAfterRemoveChild();
+
+            await this.updateLastModified({
+              model: parentTable,
+              rowIds: [childId],
+              cookie,
+            });
+          }
+        }
+        break;
+      case RelationTypes.ONE_TO_ONE:
+        {
+          const isBt = column.meta?.bt;
+          auditConfig.parentModel = isBt ? childTable : parentTable;
+          auditConfig.childModel = isBt ? parentTable : childTable;
+
+          let linkedOoRowObj;
+          let linkedCurrentOoRowObj;
+          if (isBt) {
+            // 1. check current row is linked with another child
+            linkedCurrentOoRowObj = await this.execAndParse(
+              this.dbDriver(childTn)
+                .select(childColumn.column_name)
+                .where(_wherePk(childTable.primaryKeys, rowId)),
+              null,
+              { raw: true, first: true },
+            );
+
+            const oldChildRowId = linkedCurrentOoRowObj
+              ? Object.values(linkedCurrentOoRowObj)?.[0]
+              : null;
+
+            if (oldChildRowId) {
+              const [parentRelatedPkValue, childRelatedPkValue] =
+                await this.readOnlyPrimariesByPkFromModel([
+                  { model: parentTable, id: oldChildRowId },
+                  { model: childTable, id: rowId },
+                ]);
+
+              auditUpdateObj.push({
+                model: auditConfig.parentModel,
+                childModel: auditConfig.childModel,
+                rowId,
+                childId: oldChildRowId as string,
+                op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                columnTitle: auditConfig.parentColTitle,
+                pkValue: parentRelatedPkValue,
+              });
+
+              if (parentTable.id !== childTable.id) {
+                auditUpdateObj.push({
+                  model: auditConfig.childModel,
+                  childModel: auditConfig.parentModel,
+                  rowId: oldChildRowId as string,
+                  childId: rowId,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.childColTitle,
+                  pkValue: childRelatedPkValue,
+                });
+              }
+            }
+
+            // 2. check current child is linked with another row cell
+            linkedOoRowObj = await this.execAndParse(
+              this.dbDriver(childTn).where({
                 [childColumn.column_name]: this.dbDriver.from(
                   this.dbDriver(parentTn)
                     .select(parentColumn.column_name)
-                    .where(_wherePk(parentTable.primaryKeys, childId))
+                    .where(
+                      _wherePk(parentTable.primaryKeys, isBt ? childId : rowId),
+                    )
                     .first()
                     .as('___cn_alias'),
                 ),
-              })
-              .where(_wherePk(childTable.primaryKeys, rowId)),
-            null,
-            { raw: true },
-          );
+              }),
+              null,
+              { raw: true, first: true },
+            );
+
+            if (linkedOoRowObj) {
+              const oldRowId = getCompositePkValue(
+                childTable.primaryKeys,
+                this._extractPksValues(linkedOoRowObj),
+              );
+
+              if (oldRowId) {
+                const [parentRelatedPkValue, childRelatedPkValue] =
+                  await this.readOnlyPrimariesByPkFromModel([
+                    { model: parentTable, id: childId },
+                    { model: childTable, id: oldRowId },
+                  ]);
+
+                auditUpdateObj.push({
+                  model: auditConfig.parentModel,
+                  childModel: auditConfig.childModel,
+                  rowId: oldRowId as string,
+                  childId: childId,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.parentColTitle,
+                  pkValue: parentRelatedPkValue,
+                });
+
+                if (parentTable.id !== childTable.id) {
+                  auditUpdateObj.push({
+                    model: auditConfig.childModel,
+                    childModel: auditConfig.parentModel,
+                    rowId: childId,
+                    childId: oldRowId as string,
+                    op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                    columnTitle: auditConfig.childColTitle,
+                    pkValue: childRelatedPkValue,
+                  });
+                }
+              }
+            }
+          } else {
+            // 1. check current row is linked with another child
+            linkedCurrentOoRowObj = await this.execAndParse(
+              this.dbDriver(childTn).where({
+                [childColumn.column_name]: this.dbDriver.from(
+                  this.dbDriver(parentTn)
+                    .select(parentColumn.column_name)
+                    .where(_wherePk(parentTable.primaryKeys, rowId))
+                    .first()
+                    .as('___cn_alias'),
+                ),
+              }),
+              null,
+              { raw: true, first: true },
+            );
+
+            if (linkedCurrentOoRowObj) {
+              const oldChildRowId = getCompositePkValue(
+                childTable.primaryKeys,
+                this._extractPksValues(linkedCurrentOoRowObj),
+              );
+
+              if (oldChildRowId) {
+                const [parentRelatedPkValue, childRelatedPkValue] =
+                  await this.readOnlyPrimariesByPkFromModel([
+                    { model: childTable, id: oldChildRowId },
+                    { model: parentTable, id: rowId },
+                  ]);
+
+                auditUpdateObj.push({
+                  model: auditConfig.parentModel,
+                  childModel: auditConfig.childModel,
+                  rowId,
+                  childId: oldChildRowId as string,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.parentColTitle,
+                  pkValue: parentRelatedPkValue,
+                });
+
+                if (parentTable.id !== childTable.id) {
+                  auditUpdateObj.push({
+                    model: auditConfig.childModel,
+                    childModel: auditConfig.parentModel,
+                    rowId: oldChildRowId as string,
+                    childId: rowId,
+                    op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                    columnTitle: auditConfig.childColTitle,
+                    pkValue: childRelatedPkValue,
+                  });
+                }
+              }
+            }
+
+            // 2. check current child is linked with another row cell
+            linkedOoRowObj = await this.execAndParse(
+              this.dbDriver(childTn)
+                .select(childColumn.column_name)
+                .where(_wherePk(childTable.primaryKeys, childId)),
+              null,
+              { raw: true, first: true },
+            );
+
+            const oldRowId = linkedOoRowObj
+              ? Object.values(linkedOoRowObj)?.[0]
+              : null;
+            if (oldRowId) {
+              const [parentRelatedPkValue, childRelatedPkValue] =
+                await this.readOnlyPrimariesByPkFromModel([
+                  { model: childTable, id: childId },
+                  { model: parentTable, id: oldRowId },
+                ]);
+
+              auditUpdateObj.push({
+                model: auditConfig.parentModel,
+                childModel: auditConfig.childModel,
+                rowId: oldRowId as string,
+                childId: childId,
+                op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                columnTitle: auditConfig.parentColTitle,
+                pkValue: parentRelatedPkValue,
+              });
+
+              if (parentTable.id !== childTable.id) {
+                auditUpdateObj.push({
+                  model: auditConfig.childModel,
+                  childModel: auditConfig.parentModel,
+                  rowId: childId,
+                  childId: oldRowId as string,
+                  op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
+                  columnTitle: auditConfig.childColTitle,
+                  pkValue: childRelatedPkValue,
+                });
+              }
+            }
+          }
 
-          await this.updateLastModified({
-            model: parentTable,
-            rowIds: [childId],
-            cookie,
-          });
-        }
-        break;
-      case RelationTypes.ONE_TO_ONE:
-        {
-          const isBt = column.meta?.bt;
           // todo: unlink if it's already mapped
           // unlink already mapped record if any
           await this.execAndParse(
@@ -5550,6 +6039,8 @@ class BaseModelSqlv2 {
             { raw: true },
           );
 
+          await triggerAfterRemoveChild();
+
           await this.execAndParse(
             this.dbDriver(childTn)
               .update({
@@ -5577,29 +6068,79 @@ class BaseModelSqlv2 {
         break;
     }
 
-    const response = await this.readByPk(
+    auditUpdateObj.push({
+      model: auditConfig.parentModel,
+      childModel: auditConfig.childModel,
       rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
+      childId,
+      op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+      columnTitle: auditConfig.parentColTitle,
+    });
+
+    if (parentTable.id !== childTable.id) {
+      auditUpdateObj.push({
+        model: auditConfig.childModel,
+        childModel: auditConfig.parentModel,
+        rowId: childId,
+        childId: rowId,
+        op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+        columnTitle: auditConfig.childColTitle,
+      });
+    }
+
+    await Promise.allSettled(
+      auditUpdateObj
+        .filter((a) => a.op_sub_type === AuditOperationSubTypes.LINK_RECORD)
+        .map((updateObj) => {
+          this.afterAddChild(
+            updateObj.columnTitle,
+            updateObj.rowId,
+            updateObj.childId,
+            cookie,
+            updateObj.model,
+            updateObj.childModel,
+            updateObj.pkValue,
+          );
+        }),
     );
-    await this.afterUpdate(prevData, response, this.dbDriver, cookie);
-    await this.afterAddChild(rowId, childId, cookie);
   }
 
-  public async afterAddChild(rowId, childId, req): Promise<void> {
+  public async afterAddChild(
+    columnTitle,
+    rowId,
+    childId,
+    req,
+    model = this.model,
+    childModel = this.model,
+    pkValue = undefined,
+  ): Promise<void> {
+    if (!pkValue) {
+      pkValue = await this.readByPkFromModel(
+        childModel,
+        undefined,
+        true,
+        childId,
+        false,
+        {},
+        { ignoreView: true, getHiddenColumn: true, extractOnlyPrimaries: true },
+      );
+    }
+
     await Audit.insert({
-      fk_workspace_id: this.model.fk_workspace_id,
-      base_id: this.model.base_id,
-      source_id: this.model.source_id,
-      fk_model_id: this.model.id,
+      fk_workspace_id: model.fk_workspace_id,
+      base_id: model.base_id,
+      source_id: model.source_id,
+      fk_model_id: model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.LINK_RECORD,
       row_id: rowId,
       description: DOMPurify.sanitize(
-        `Record [id:${childId}] has been linked with record [id:${rowId}] in ${this.model.title}`,
+        `Record [id:${childId}] has been linked with record [id:${rowId}] in ${model.title}`,
       ),
-      // details: JSON.stringify(data),
+      details: DOMPurify.sanitize(`<span class="">${columnTitle}</span>
+      : <span class="black--text green lighten-4 px-2">${
+        pkValue ?? null
+      }</span>`),
       ip: req?.clientIp,
       user: req?.user?.email,
     });
@@ -5618,7 +6159,6 @@ class BaseModelSqlv2 {
   }) {
     const columns = await this.model.getColumns(this.context);
     const column = columns.find((c) => c.id === colId);
-
     if (
       !column ||
       ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
@@ -5639,13 +6179,31 @@ class BaseModelSqlv2 {
     const childTn = this.getTnPath(childTable);
     const parentTn = this.getTnPath(parentTable);
 
-    const prevData = await this.readByPk(
-      rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
+    const relatedChildCol = getRelatedLinksColumn(
+      column,
+      this.model.id === parentTable.id ? childTable : parentTable,
     );
 
+    const auditUpdateObj = [] as {
+      rowId: string;
+      childId: string;
+      model: Model;
+      childModel: Model;
+      columnTitle: string;
+    }[];
+
+    const auditConfig = {
+      childModel: childTable,
+      parentModel: parentTable,
+      childColTitle: relatedChildCol?.title || '',
+      parentColTitle: column.title,
+    } as {
+      childModel: Model;
+      parentModel: Model;
+      childColTitle: string;
+      parentColTitle: string;
+    };
+
     switch (colOptions.type) {
       case RelationTypes.MANY_TO_MANY:
         {
@@ -5682,6 +6240,11 @@ class BaseModelSqlv2 {
             rowIds: [rowId],
             cookie,
           });
+
+          auditConfig.parentModel =
+            this.model.id === parentTable.id ? parentTable : childTable;
+          auditConfig.childModel =
+            this.model.id === parentTable.id ? childTable : parentTable;
         }
         break;
       case RelationTypes.HAS_MANY:
@@ -5709,6 +6272,9 @@ class BaseModelSqlv2 {
         break;
       case RelationTypes.BELONGS_TO:
         {
+          auditConfig.parentModel = childTable;
+          auditConfig.childModel = parentTable;
+
           await this.execAndParse(
             this.dbDriver(childTn)
               // .where({
@@ -5733,6 +6299,10 @@ class BaseModelSqlv2 {
       case RelationTypes.ONE_TO_ONE:
         {
           const isBt = column.meta?.bt;
+
+          auditConfig.parentModel = isBt ? childTable : parentTable;
+          auditConfig.childModel = isBt ? parentTable : childTable;
+
           await this.execAndParse(
             this.dbDriver(childTn)
               .where(_wherePk(childTable.primaryKeys, isBt ? rowId : childId))
@@ -5750,29 +6320,76 @@ class BaseModelSqlv2 {
         break;
     }
 
-    const newData = await this.readByPk(
+    auditUpdateObj.push({
+      model: auditConfig.parentModel,
+      childModel: auditConfig.childModel,
       rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
+      childId,
+      columnTitle: auditConfig.parentColTitle,
+    });
+
+    if (parentTable.id !== childTable.id) {
+      auditUpdateObj.push({
+        model: auditConfig.childModel,
+        childModel: auditConfig.parentModel,
+        rowId: childId,
+        childId: rowId,
+        columnTitle: auditConfig.childColTitle,
+      });
+    }
+
+    await Promise.allSettled(
+      auditUpdateObj.map(async (updateObj) => {
+        await this.afterRemoveChild(
+          updateObj.columnTitle,
+          updateObj.rowId,
+          updateObj.childId,
+          cookie,
+          updateObj.model,
+          updateObj.childModel,
+        );
+      }),
     );
-    await this.afterUpdate(prevData, newData, this.dbDriver, cookie);
-    await this.afterRemoveChild(rowId, childId, cookie);
   }
 
-  public async afterRemoveChild(rowId, childId, req): Promise<void> {
+  public async afterRemoveChild(
+    columnTitle,
+    rowId,
+    childId,
+    req,
+    model = this.model,
+    childModel = this.model,
+    pkValue = undefined,
+  ): Promise<void> {
+    if (!pkValue) {
+      pkValue = await this.readByPkFromModel(
+        childModel,
+        undefined,
+        true,
+        childId,
+        false,
+        {},
+        { ignoreView: true, getHiddenColumn: true, extractOnlyPrimaries: true },
+      );
+    }
+
     await Audit.insert({
-      fk_workspace_id: this.model.fk_workspace_id,
-      base_id: this.model.base_id,
-      source_id: this.model.source_id,
-      fk_model_id: this.model.id,
+      fk_workspace_id: model.fk_workspace_id,
+      base_id: model.base_id,
+      source_id: model.source_id,
+      fk_model_id: model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.UNLINK_RECORD,
       row_id: rowId,
       description: DOMPurify.sanitize(
-        `Record [id:${childId}] has been unlinked with record [id:${rowId}] in ${this.model.title}`,
+        `Record [id:${childId}] has been unlinked with record [id:${rowId}] in ${model.title}`,
       ),
-      // details: JSON.stringify(data),
+      details: DOMPurify.sanitize(`<span class="">${columnTitle}</span>
+        : <span class="text-decoration-line-through red px-2 lighten-4 black--text">${
+          pkValue && typeof pkValue === 'object'
+            ? Object.values(pkValue)[0]
+            : pkValue ?? null
+        }</span>`),
       ip: req?.clientIp,
       user: req?.user?.email,
     });
@@ -6654,6 +7271,34 @@ class BaseModelSqlv2 {
     let relationType = colOptions.type;
     let childIds = _childIds;
 
+    const relatedChildCol = getRelatedLinksColumn(
+      column,
+      this.model.id === parentTable.id ? childTable : parentTable,
+    );
+
+    const auditUpdateObj = [] as {
+      rowId: string | number;
+      childId: string | number;
+      model: Model;
+      childModel: Model;
+      op_sub_type:
+        | AuditOperationSubTypes.LINK_RECORD
+        | AuditOperationSubTypes.UNLINK_RECORD;
+      columnTitle: string;
+    }[];
+
+    const auditConfig = {
+      childModel: childTable,
+      parentModel: parentTable,
+      childColTitle: relatedChildCol?.title || '',
+      parentColTitle: column.title,
+    } as {
+      childModel: Model;
+      parentModel: Model;
+      childColTitle: string;
+      parentColTitle: string;
+    };
+
     if (relationType === RelationTypes.ONE_TO_ONE) {
       relationType = column.meta?.bt
         ? RelationTypes.BELONGS_TO
@@ -6681,6 +7326,9 @@ class BaseModelSqlv2 {
         null,
         { raw: true },
       );
+
+      auditConfig.parentModel = column.meta?.bt ? childTable : parentTable;
+      auditConfig.childModel = column.meta?.bt ? parentTable : childTable;
     }
 
     switch (relationType) {
@@ -6779,6 +7427,11 @@ class BaseModelSqlv2 {
             rowIds: [rowId],
             cookie,
           });
+
+          auditConfig.parentModel =
+            this.model.id === parentTable.id ? parentTable : childTable;
+          auditConfig.childModel =
+            this.model.id === parentTable.id ? childTable : parentTable;
         }
         break;
       case RelationTypes.HAS_MANY:
@@ -6859,6 +7512,9 @@ class BaseModelSqlv2 {
         break;
       case RelationTypes.BELONGS_TO:
         {
+          auditConfig.parentModel = childTable;
+          auditConfig.childModel = parentTable;
+
           // validate Ids
           {
             const childRowsQb = this.dbDriver(parentTn)
@@ -6902,16 +7558,45 @@ class BaseModelSqlv2 {
         break;
     }
 
-    const updatedRow = await this.readByPk(
-      rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
-    );
-    await this.afterUpdate(row, updatedRow, this.dbDriver, cookie);
     for (const childId of childIds) {
-      await this.afterAddChild(rowId, childId, cookie);
+      const _childId =
+        typeof childId === 'object'
+          ? Object.values(childId).join('_')
+          : childId;
+
+      auditUpdateObj.push({
+        model: auditConfig.parentModel,
+        childModel: auditConfig.childModel,
+        rowId,
+        childId: _childId,
+        op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+        columnTitle: auditConfig.parentColTitle,
+      });
+
+      if (parentTable.id !== childTable.id) {
+        auditUpdateObj.push({
+          model: auditConfig.childModel,
+          childModel: auditConfig.parentModel,
+          rowId: _childId,
+          childId: rowId,
+          op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+          columnTitle: auditConfig.childColTitle,
+        });
+      }
     }
+
+    await Promise.allSettled(
+      auditUpdateObj.map(async (updateObj) => {
+        await this.afterAddChild(
+          updateObj.columnTitle,
+          updateObj.rowId,
+          updateObj.childId,
+          cookie,
+          updateObj.model,
+          updateObj.childModel,
+        );
+      }),
+    );
   }
 
   async removeLinks({
@@ -6958,6 +7643,34 @@ class BaseModelSqlv2 {
     const childTn = this.getTnPath(childTable);
     const parentTn = this.getTnPath(parentTable);
 
+    const relatedChildCol = getRelatedLinksColumn(
+      column,
+      this.model.id === parentTable.id ? childTable : parentTable,
+    );
+
+    const auditUpdateObj = [] as {
+      rowId: string | number;
+      childId: string | number;
+      model: Model;
+      childModel: Model;
+      op_sub_type:
+        | AuditOperationSubTypes.LINK_RECORD
+        | AuditOperationSubTypes.UNLINK_RECORD;
+      columnTitle: string;
+    }[];
+
+    const auditConfig = {
+      childModel: childTable,
+      parentModel: parentTable,
+      childColTitle: relatedChildCol?.title || '',
+      parentColTitle: column.title,
+    } as {
+      childModel: Model;
+      parentModel: Model;
+      childColTitle: string;
+      parentColTitle: string;
+    };
+
     switch (colOptions.type) {
       case RelationTypes.MANY_TO_MANY:
         {
@@ -7052,6 +7765,11 @@ class BaseModelSqlv2 {
             rowIds: [rowId],
             cookie,
           });
+
+          auditConfig.parentModel =
+            this.model.id === parentTable.id ? parentTable : childTable;
+          auditConfig.childModel =
+            this.model.id === parentTable.id ? childTable : parentTable;
         }
         break;
       case RelationTypes.HAS_MANY:
@@ -7138,6 +7856,9 @@ class BaseModelSqlv2 {
         break;
       case RelationTypes.BELONGS_TO:
         {
+          auditConfig.parentModel = childTable;
+          auditConfig.childModel = parentTable;
+
           // validate Ids
           {
             if (childIds.length > 1)
@@ -7184,16 +7905,45 @@ class BaseModelSqlv2 {
         break;
     }
 
-    const updatedRow = await this.readByPk(
-      rowId,
-      false,
-      {},
-      { ignoreView: true, getHiddenColumn: true },
-    );
-    await this.afterUpdate(row, updatedRow, this.dbDriver, cookie);
     for (const childId of childIds) {
-      await this.afterRemoveChild(rowId, childId, cookie);
+      const _childId =
+        typeof childId === 'object'
+          ? Object.values(childId).join('_')
+          : childId;
+
+      auditUpdateObj.push({
+        model: auditConfig.parentModel,
+        childModel: auditConfig.childModel,
+        rowId,
+        childId: _childId,
+        op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+        columnTitle: auditConfig.parentColTitle,
+      });
+
+      if (parentTable.id !== childTable.id) {
+        auditUpdateObj.push({
+          model: auditConfig.childModel,
+          childModel: auditConfig.parentModel,
+          rowId: _childId,
+          childId: rowId,
+          op_sub_type: AuditOperationSubTypes.LINK_RECORD,
+          columnTitle: auditConfig.childColTitle,
+        });
+      }
     }
+
+    await Promise.allSettled(
+      auditUpdateObj.map(async (updateObj) => {
+        await this.afterRemoveChild(
+          updateObj.columnTitle,
+          updateObj.rowId,
+          updateObj.childId,
+          cookie,
+          updateObj.model,
+          updateObj.childModel,
+        );
+      }),
+    );
   }
 
   async btRead(
@@ -7914,4 +8664,27 @@ function extractIds(
   );
 }
 
+function getRelatedLinksColumn(
+  column: Column<LinkToAnotherRecordColumn>,
+  relatedModel: Model,
+) {
+  return relatedModel.columns.find((c: Column) => {
+    if (column.colOptions?.type === RelationTypes.MANY_TO_MANY) {
+      return (
+        column.colOptions.fk_mm_child_column_id ===
+          c.colOptions?.fk_mm_parent_column_id &&
+        column.colOptions.fk_mm_parent_column_id ===
+          c.colOptions?.fk_mm_child_column_id
+      );
+    } else {
+      return (
+        column.colOptions.fk_child_column_id ===
+          c.colOptions?.fk_child_column_id &&
+        column.colOptions.fk_parent_column_id ===
+          c.colOptions?.fk_parent_column_id
+      );
+    }
+  });
+}
+
 export { BaseModelSqlv2 };
diff --git a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
index f3f3896a97..d9369213f4 100644
--- a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
+++ b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
@@ -44,6 +44,8 @@ export class AuthTokenStrategy extends PassportStrategy(Strategy, 'authtoken') {
 
         Object.assign(user, {
           id: dbUser.id,
+          email: dbUser.email,
+          display_name: dbUser.display_name,
           roles: extractRolesObj(dbUser.roles),
           base_roles: extractRolesObj(dbUser.base_roles),
           ...(dbUser.workspace_roles
diff --git a/packages/nocodb/src/strategies/jwt.strategy.ts b/packages/nocodb/src/strategies/jwt.strategy.ts
index 751498cfa6..cb6dea072d 100644
--- a/packages/nocodb/src/strategies/jwt.strategy.ts
+++ b/packages/nocodb/src/strategies/jwt.strategy.ts
@@ -14,7 +14,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(req, jwtPayload) {
-    if (!jwtPayload?.email) {
+    if (!jwtPayload?.email || jwtPayload?.is_api_token) {
       return jwtPayload;
     }