diff --git a/deploy/build.bat b/deploy/build.bat
index 28204e7a72..e5a90eb1df 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -24,6 +24,7 @@ cd ..\..
 echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
+IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
index 487f4e66e7..8e47e20604 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
@@ -21,9 +21,9 @@ import { DATA_EDITOR_SETTINGS_GROUP } from './DATA_EDITOR_SETTINGS_GROUP';
 const defaultSettings = schema.object({
   disableEdit: schema.coerce.boolean().default(false),
   disableCopyData: schema.coerce.boolean().default(false),
-  fetchMin: schema.coerce.number().default(100),
-  fetchMax: schema.coerce.number().default(5000),
-  fetchDefault: schema.coerce.number().default(200),
+  fetchMin: schema.coerce.number().min(10).default(100),
+  fetchMax: schema.coerce.number().min(10).default(5000),
+  fetchDefault: schema.coerce.number().min(10).default(200),
 });
 
 export type DataViewerSettings = schema.infer<typeof defaultSettings>;