diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index 21c64e7f13..e0b8250cbf 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -96,13 +96,14 @@ export class DataGridContextMenuFilterService {
           const val = typeof value === 'function' ? value() : value;
           const stringifyValue = format.toDisplayString(val);
           const wrappedValue = wrapOperationArgument(operation.id, stringifyValue);
-          const clippeddValue = replaceMiddle(wrappedValue, ' ... ', 8, 30);
-          return `${columnLabel} ${operation.expression} ${clippeddValue}`;
+          const clippedValue = replaceMiddle(wrappedValue, ' ... ', 8, 30);
+          return `${columnLabel} ${operation.expression} ${clippedValue}`;
         },
         icon,
         onClick: async () => {
           const val = typeof value === 'function' ? value() : value;
-          await this.applyFilter(model, resultIndex, column, operation.id, val);
+          const wrappedValue = wrapOperationArgument(operation.id, val);
+          await this.applyFilter(model, resultIndex, column, operation.id, wrappedValue);
         },
       }));
   }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
index 19e76db85b..8c92b19662 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
@@ -254,14 +254,11 @@ export function getNextOrder(order: Order): Order {
 }
 
 export function wrapOperationArgument(operationId: string, argument: any): string {
-  let result = argument;
   if (operationId === 'LIKE') {
-    result = `%${result} %`;
+    return `%${argument}%`;
   }
 
-  result = `'${result}'`;
-
-  return result;
+  return argument;
 }
 
 export function isFilterConstraint(constraint: SqlDataFilterConstraint): boolean {