diff --git a/packages/api/package.json b/packages/api/package.json
index 0a94f7002..2f326cc53 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -12,10 +12,6 @@
   "license": "GPL",
   "keywords": [
     "sql",
-    "mssql",
-    "mssql",
-    "postgresql",
-    "excel",
     "json",
     "import",
     "export",
diff --git a/packages/api/src/controllers/plugins.js b/packages/api/src/controllers/plugins.js
index e382c0f1d..5b4d95bb0 100644
--- a/packages/api/src/controllers/plugins.js
+++ b/packages/api/src/controllers/plugins.js
@@ -27,7 +27,7 @@ async function loadPackageInfo(dir) {
 module.exports = {
   script_meta: 'get',
   async script({ packageName }) {
-    const file = path.join(pluginsdir(), packageName, 'lib', 'frontend.js');
+    const file = path.join(pluginsdir(), packageName, 'dist', 'frontend.js');
     const data = await fs.readFile(file, {
       encoding: 'utf-8',
     });
diff --git a/packages/api/src/shell/jsonLinesReader.js b/packages/api/src/shell/jsonLinesReader.js
index e36db95fc..0a7018bd1 100644
--- a/packages/api/src/shell/jsonLinesReader.js
+++ b/packages/api/src/shell/jsonLinesReader.js
@@ -18,6 +18,7 @@ class ParseStream extends stream.Transform {
     }
     if (!this.limitRows || this.rowsWritten < this.limitRows) {
       this.push(obj);
+      this.rowsWritten += 1;
     }
     done();
   }
diff --git a/packages/api/src/shell/requirePlugin.js b/packages/api/src/shell/requirePlugin.js
index 386d3a3ee..910c42ca1 100644
--- a/packages/api/src/shell/requirePlugin.js
+++ b/packages/api/src/shell/requirePlugin.js
@@ -13,7 +13,7 @@ function requirePlugin(packageName, requiredPlugin = null) {
 
   if (requiredPlugin == null) {
     console.log('Loading module', packageName);
-    const module = require(path.join(pluginsdir(), packageName, 'lib', 'backend.js'));
+    const module = require(path.join(pluginsdir(), packageName, 'dist', 'backend.js'));
     requiredPlugin = module.__esModule ? module.default : module;
   }
   loadedPlugins[packageName] = requiredPlugin;
diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index d3ffc940d..177a0b715 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -424,6 +424,7 @@ export abstract class GridDisplay {
   }
 
   getPageQuery(offset: number, count: number) {
+    if (!this.driver) return null;
     const select = this.createSelect();
     if (!select) return null;
     if (this.driver.dialect.rangeSelect) select.range = { offset: offset, limit: count };
diff --git a/packages/web/src/datagrid/TableDataGrid.js b/packages/web/src/datagrid/TableDataGrid.js
index 4239e7da1..d5bafb689 100644
--- a/packages/web/src/datagrid/TableDataGrid.js
+++ b/packages/web/src/datagrid/TableDataGrid.js
@@ -50,7 +50,7 @@ export default function TableDataGrid({
   const [childCache, setChildCache] = React.useState(createGridCache());
   const [refReloadToken, setRefReloadToken] = React.useState(0);
   const [myLoadedTime, setMyLoadedTime] = React.useState(0);
-  const extension = useExtensions();
+  const extensions = useExtensions();
 
   const { childConfig } = config;
   const setChildConfig = (value, reference = undefined) => {
@@ -77,7 +77,7 @@ export default function TableDataGrid({
     return connection
       ? new TableGridDisplay(
           { schemaName, pureName },
-          findEngineDriver(connection, extension),
+          findEngineDriver(connection, extensions),
           config,
           setConfig,
           cache || myCache,
@@ -99,7 +99,7 @@ export default function TableDataGrid({
     if (!newDisplay) return;
     if (display && display.isLoadedCorrectly && !newDisplay.isLoadedCorrectly) return;
     setDisplay(newDisplay);
-  }, [connection, config, cache || myCache, conid, database, schemaName, pureName, dbinfo]);
+  }, [connection, config, cache || myCache, conid, database, schemaName, pureName, dbinfo, extensions]);
 
   const handleDatabaseStructureChanged = React.useCallback(() => {
     (setCache || setMyCache)(createGridCache());