diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index b4bd097..9839bec 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,7 +7,6 @@
     "yzhang.markdown-all-in-one",
     "joaompinto.asciidoctor-vscode",
     "henoc.svgeditor",
-    "msjsdiag.debugger-for-chrome",
     "cmstead.jsrefactor",
     "eg2.vscode-npm-script",
     "esbenp.prettier-vscode",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e14c07b..bbd3c30 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -16,7 +16,7 @@
             "request": "launch",
             "name": "Launch Storybook in Chrome",
             "breakOnLoad": true,
-            "url": "http://localhost:6006/?path=/story/form-artifactformoverride--remote-data",
+            "url": "http://localhost:6006/?path=/story/several-controls-tree-table-form--mktp-categories",
             "sourceMaps": true,
             "webRoot": "${workspaceFolder}",
             "sourceMapPathOverrides": {
diff --git a/package.json b/package.json
index 5006346..a0cf715 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agentlab/ldkg-ui-react",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "LDKG Forms UI Components",
   "license": "GPL-3.0",
   "author": "Alexey Ivanov <amivanoff@gmail.com>",
@@ -51,7 +51,7 @@
     "lint-staged": "lint-staged"
   },
   "peerDependencies": {
-    "@agentlab/sparql-jsld-client": ">=5.0.0-rc.11",
+    "@agentlab/sparql-jsld-client": ">=5.0.0-rc.12",
     "@ant-design/icons": ">=4.6.4",
     "@rdfjs/data-model": ">=1.3.3",
     "@tinymce/tinymce-react": ">=3.12.6",
@@ -80,7 +80,7 @@
     "uuid62": ">=1.0.1"
   },
   "dependencies": {
-    "@agentlab/sparql-jsld-client": "^5.0.0-rc.11",
+    "@agentlab/sparql-jsld-client": "^5.0.0-rc.12",
     "@ant-design/icons": "^4.6.4",
     "@tinymce/tinymce-react": "^3.12.6",
     "@types/react": "^17.0.20",
@@ -130,8 +130,8 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
     "@types/jest": "^27.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.31.0",
+    "@typescript-eslint/parser": "^4.31.0",
     "autoprefixer": "^10.3.4",
     "babel-loader": "^8.2.2",
     "cross-env": "^7.0.3",
diff --git a/src/layouts/AntdFormLayout.tsx b/src/layouts/AntdFormLayout.tsx
index 5315555..f96a942 100644
--- a/src/layouts/AntdFormLayout.tsx
+++ b/src/layouts/AntdFormLayout.tsx
@@ -95,7 +95,7 @@ export const AntdFormLayout: React.FC<any> = ({
         <div style={{ width, height, overflow: 'auto' }} onClick={() => onEdit()}>
           <span style={{ padding: '7px', fontSize: '2em' }}>{title}</span>
           <LogicalButton form={id} onSave={onSave} onCancel={onCancel} />
-          <Form {...formItemLayout}>
+          <Form labelAlign={'left'}>
             <AntdVerticalLayoutWithStore
               id={`${id}Layout`}
               viewKind={viewKind}
diff --git a/src/layouts/form.css b/src/layouts/form.css
index 0830417..296d520 100644
--- a/src/layouts/form.css
+++ b/src/layouts/form.css
@@ -27,3 +27,7 @@
   color: rgb(255, 255, 255);
   background-color: rgba(145, 145, 145, 0.616);
 }
+
+.ant-form-item {
+  margin-bottom: 2px;
+}
diff --git a/src/table/BaseTableArrayControlRenderer.tsx b/src/table/BaseTableArrayControlRenderer.tsx
index 3ae053c..cfce6e3 100644
--- a/src/table/BaseTableArrayControlRenderer.tsx
+++ b/src/table/BaseTableArrayControlRenderer.tsx
@@ -11,10 +11,10 @@ import React from 'react';
 import { RankedTester, rankWith, uiTypeIs } from '../testers';
 import { withStoreToArrayProps } from '../util/ContextToProps';
 
-import { JsonSchemaTable } from './BaseTableControl';
+import { BaseTableControl } from './BaseTableControl';
 
 export const BaseTableArrayControlRenderer = (props: any) => {
-  return <JsonSchemaTable {...props} />;
+  return <BaseTableControl {...props} />;
 };
 
 export const tableArrayControlTester: RankedTester = rankWith(3, uiTypeIs('aldkg:Array'));
diff --git a/src/table/BaseTableControl.tsx b/src/table/BaseTableControl.tsx
index 13cac0c..712f16f 100644
--- a/src/table/BaseTableControl.tsx
+++ b/src/table/BaseTableControl.tsx
@@ -38,7 +38,7 @@ const createTableData = (data: any) => {
   });
 };
 
-export const JsonSchemaTable: React.FC<JsonSchemaTableProps> = React.memo(
+export const BaseTableControl: React.FC<JsonSchemaTableProps> = React.memo(
   ({
     viewKind,
     viewKindElement,
@@ -52,7 +52,7 @@ export const JsonSchemaTable: React.FC<JsonSchemaTableProps> = React.memo(
     loadMoreData,
     onSwap = () => {},
     onChangeData = () => {},
-    onSelect,
+    onSelect = () => {},
     onDeleteRows,
     onSort,
     loadExpandedData,
diff --git a/src/table/basetable/BaseTableMenu.tsx b/src/table/basetable/BaseTableMenu.tsx
index 258dbfb..8efb0df 100644
--- a/src/table/basetable/BaseTableMenu.tsx
+++ b/src/table/basetable/BaseTableMenu.tsx
@@ -32,21 +32,21 @@ interface BaseTablrMenu {
 
 const labelsRu: JsStrObj = {
   'table.menu.createArtifactBefore': 'Создать перед',
-  'table.menu.createArtifactBefore0': 'Создать перед {{ count }} требованием',
-  'table.menu.createArtifactBefore1': 'Создать перед {{ count }} требованиями',
-  'table.menu.createArtifactBefore2': 'Создать перед {{ count }} требованиями',
+  'table.menu.createArtifactBefore0': 'Создать перед {{ count }}',
+  'table.menu.createArtifactBefore1': 'Создать перед {{ count }}',
+  'table.menu.createArtifactBefore2': 'Создать перед {{ count }}',
   'table.menu.createArtifactAfter': 'Создать после',
-  'table.menu.createArtifactAfter0': 'Создать после {{ count }} требованием',
-  'table.menu.createArtifactAfter1': 'Создать после {{ count }} требований',
-  'table.menu.createArtifactAfter2': 'Создать после {{ count }} требований',
-  'table.menu.deleteArtifacts': 'Удалить требование',
-  'table.menu.deleteArtifacts0': 'Удалить {{ count }} требование',
-  'table.menu.deleteArtifacts1': 'Удалить {{ count }} требования',
-  'table.menu.deleteArtifacts2': 'Удалить {{ count }} требований',
+  'table.menu.createArtifactAfter0': 'Создать после {{ count }}',
+  'table.menu.createArtifactAfter1': 'Создать после {{ count }}',
+  'table.menu.createArtifactAfter2': 'Создать после {{ count }}',
+  'table.menu.deleteArtifacts': 'Удалить',
+  'table.menu.deleteArtifacts0': 'Удалить {{ count }}',
+  'table.menu.deleteArtifacts1': 'Удалить {{ count }}',
+  'table.menu.deleteArtifacts2': 'Удалить {{ count }}',
   'table.menu.linkArtifacts': 'Слинковать',
-  'table.menu.linkArtifacts0': 'Слинковать {{ count }} требование',
-  'table.menu.linkArtifacts1': 'Слинковать {{ count }} требования',
-  'table.menu.linkArtifacts2': 'Слинковать {{ count }} требований',
+  'table.menu.linkArtifacts0': 'Слинковать {{ count }}',
+  'table.menu.linkArtifacts1': 'Слинковать {{ count }}',
+  'table.menu.linkArtifacts2': 'Слинковать {{ count }}',
 };
 
 export const BaseTableMenu: React.FC<BaseTablrMenu> = ({
diff --git a/src/table/basetable/ReactBaseTable.tsx b/src/table/basetable/ReactBaseTable.tsx
index e4be7b3..ba3bde7 100644
--- a/src/table/basetable/ReactBaseTable.tsx
+++ b/src/table/basetable/ReactBaseTable.tsx
@@ -227,13 +227,14 @@ export const EditableTable: React.FC<EditableTableProps<any>> = React.memo(
       onClick: ({ rowData, event }: any) => {
         const idx = selection.indexOf(rowData);
         let newSelection = [...selection];
-        if (idx != -1) {
-          newSelection = newSelection.splice(idx, 1);
+        if (idx !== -1) {
+          if (newSelection.length === 1) newSelection = [];
+          else newSelection.splice(idx, 1);
         } else {
           newSelection.push(rowData);
         }
         setSelection(newSelection);
-        onSelect(rowData);
+        onSelect(newSelection);
       },
     };
 
@@ -287,19 +288,20 @@ export const EditableTable: React.FC<EditableTableProps<any>> = React.memo(
       });
     };
     const setExpanded = (expanded: boolean, id: string) => {
-      const newExpandedRowKeys = [...expandedRowKeys];
+      let newExpandedRowKeys = [...expandedRowKeys];
       if (expanded) {
         newExpandedRowKeys.push(id);
       } else {
         const idx = newExpandedRowKeys.findIndex((e: string) => e === id);
-        newExpandedRowKeys.splice(idx, 1);
+        if (newExpandedRowKeys.length === 1) newExpandedRowKeys = [];
+        else newExpandedRowKeys.splice(idx, 1);
       }
       setExpandedRowKeys(newExpandedRowKeys);
     };
     const loadMore = () => {
-      if (!limit) {
-        setLoadedAll(true);
-      } else {
+      //if (!limit) {
+      setLoadedAll(true);
+      /*} else {
         setLoadingMore(true);
         loadMoreData(data.length).then((d: any) => {
           if (d.length < limit) {
@@ -309,7 +311,7 @@ export const EditableTable: React.FC<EditableTableProps<any>> = React.memo(
           setData(newData);
           setLoadingMore(false);
         });
-      }
+      }*/
     };
     const renderOverlay = () => {
       if (loadingMore)
@@ -331,6 +333,10 @@ export const EditableTable: React.FC<EditableTableProps<any>> = React.memo(
       setData(newData);
     };
     useEffect(() => {
+      setSelectedRowKeys([]);
+      setExpandedRowKeys([]);
+      setSelection([]);
+      onSelect([]);
       const newData = checkChildren(dataSource);
       if (newData.length < limit) {
         setLoadedAll(true);
diff --git a/src/util/ContextToProps.tsx b/src/util/ContextToProps.tsx
index 9d754e1..fdf2192 100644
--- a/src/util/ContextToProps.tsx
+++ b/src/util/ContextToProps.tsx
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: GPL-3.0-only
  ********************************************************************************/
-import { cloneDeep, get, isEqual, omit } from 'lodash-es';
+import { cloneDeep, get, isArray, isEqual, omit } from 'lodash-es';
 
 import React, { useContext, useState } from 'react';
 import { Spin } from 'antd';
@@ -258,13 +258,13 @@ export const withStoreToDataControlProps = (Component: any): any =>
       //store.loadData(scope);
       return <Spin />;
     }
-    const scope = viewKindElement.resultsScope;
+    //const scope = viewKindElement.resultsScope;
     data = cloneDeep(getSnapshot(data));
     const options = viewKindElement?.options || {};
     const withConnections = options.connections;
-    const onChange = (data: any) => {
+    const onSelect = (data: any) => {
       if (data) {
-        store.setSelectedData(scope, data);
+        store.setSelectedData(collIriOverride, data);
         withConnections && store.editConn(withConnections, data);
       }
     };
@@ -297,7 +297,7 @@ export const withStoreToDataControlProps = (Component: any): any =>
         viewKindElement={viewKindElement}
         viewDescr={viewDescr}
         viewDescrElement={viewDescrElement}
-        handleChange={onChange}
+        handleChange={onSelect}
         onCreateFolder={onCreateFolder}
         getData={getData}
         onDnD={onDnD}
@@ -478,7 +478,7 @@ export const withStoreToArrayProps = (Component: any): any =>
       return <Spin />;
     }
     data = getSnapshot(data);
-    const loadMoreData = (offset: number) => {
+    const loadMoreData = async (offset: number) => {
       return data; //store.loadDataByUri(scope, offset);
     };
     const withConnections = options.connections;
@@ -495,14 +495,17 @@ export const withStoreToArrayProps = (Component: any): any =>
         applySnapshot(coll?.data, newData);
       }
     };
-    const onChange = (data: any) => {
-      /*store.setSelectedData(scope, data);
-      withConnections &&
-        options.connections.forEach((e: any) => {
-          const condition: any = {};
-          condition[e.by] = data['@id'];
-          store.editCondition(e.to, condition, scope, e.by, data);
-        });*/
+    const onSelect = (data: any) => {
+      console.log('onChange', data);
+      if (data && isArray(data)) {
+        if (data.length === 1) {
+          store.setSelectedData(collIriOverride, data[0]);
+          withConnections && store.editConn(withConnections, data[0]);
+        } else {
+          store.setSelectedData(collIriOverride, undefined);
+          withConnections && store.editConn(withConnections, undefined);
+        }
+      }
     };
     const loadExpandedData = (subject: string) => {
       //const newQuery = store.queries[viewKindElement.resultsScope];
@@ -528,7 +531,7 @@ export const withStoreToArrayProps = (Component: any): any =>
         }}
         data={data}
         options={options}
-        onSelect={onChange}
+        onSelect={onSelect}
       />
     );
   });
diff --git a/stories/TableLocalArtifacts.stories.tsx b/stories/TableLocalArtifacts.stories.tsx
index e2247fe..732b269 100644
--- a/stories/TableLocalArtifacts.stories.tsx
+++ b/stories/TableLocalArtifacts.stories.tsx
@@ -16,7 +16,7 @@ import { asReduxStore, connectReduxDevtools } from 'mst-middlewares';
 import { SparqlClientImpl, MstRepository, rootModelInitialState } from '@agentlab/sparql-jsld-client';
 
 import { artifactSchema } from '../test/schema/TestSchemas';
-import { JsonSchemaTable } from '../src/table/BaseTableControl';
+import { BaseTableControl } from '../src/table/BaseTableControl';
 
 import {
   antdCells,
@@ -924,7 +924,7 @@ const fakeData = [
 
 export default {
   title: 'Table/LocalArtifacts',
-  component: JsonSchemaTable,
+  component: BaseTableControl,
 } as Meta;
 
 const Template: Story = (args: any) => {
@@ -940,7 +940,7 @@ const Template: Story = (args: any) => {
     <div style={{ height: 'calc(100vh - 32px)' }}>
       <Provider store={store}>
         <MstContextProvider store={rootStore} renderers={antdRenderers} cells={antdCells}>
-          <JsonSchemaTable
+          <BaseTableControl
             schema={artifactSchema}
             path=''
             data={fakeData}
diff --git a/stories/TreeAndFormMktp.stories.tsx b/stories/TreeTableFormMktp.stories.tsx
similarity index 75%
rename from stories/TreeAndFormMktp.stories.tsx
rename to stories/TreeTableFormMktp.stories.tsx
index ea3c211..1806196 100644
--- a/stories/TreeAndFormMktp.stories.tsx
+++ b/stories/TreeTableFormMktp.stories.tsx
@@ -30,42 +30,66 @@ import {
   Form,
   MstContextProvider,
   RendererRegistryEntry,
+  tableRenderers,
 } from '../src';
 import { viewKindCollConstr, viewDescrCollConstr } from '../src/models/ViewCollConstrs';
 import { createUiModelFromState } from '../src/models/MstViewDescr';
 
 const viewKinds = [
   {
-    '@id': 'mktp:TreeAndFormViewKind',
+    '@id': 'mktp:TreeTableFormMktpCategoriesViewKind',
     '@type': 'aldkg:ViewKind',
-    title: 'TreeAndForm',
-    description: 'TreeAndForm',
+    title: 'Tree-Table-Form Mktp Categories',
+    description: 'Tree-Table-Form Mktp Categories',
     collsConstrs: [
       {
-        '@id': 'mktp:Categories_Coll',
+        '@id': 'mktp:HSCategories_Coll',
         '@type': 'aldkg:CollConstr',
         entConstrs: [
           {
-            '@id': 'mktp:Categories_Coll_Shape0',
+            '@id': 'mktp:HSCategories_Coll_Shape0',
             '@type': 'aldkg:EntConstr',
             schema: 'hs:CategoryShape',
           },
         ],
       },
       {
-        '@id': 'mktp:Category_Coll',
+        '@id': 'mktp:KPCategories_Coll',
         '@type': 'aldkg:CollConstr',
         entConstrs: [
           {
-            '@id': 'mktp:Cards_Coll_Ent0',
+            '@id': 'mktp:KPCategories_Coll_Shape0',
             '@type': 'aldkg:EntConstr',
-            schema: 'hs:CategoryShape',
+            schema: 'kp:CategoryShape',
+          },
+        ],
+      },
+      {
+        '@id': 'mktp:TBCategories_Coll',
+        '@type': 'aldkg:CollConstr',
+        entConstrs: [
+          {
+            '@id': 'mktp:TBCategories_Coll_Shape0',
+            '@type': 'aldkg:EntConstr',
+            schema: 'tb:CategoryShape',
+          },
+        ],
+      },
+      {
+        '@id': 'mktp:ProductCards_in_Category_Coll',
+        '@type': 'aldkg:CollConstr',
+        entConstrs: [
+          {
+            '@id': 'mktp:ProductCards_in_Category_Coll_Ent0',
+            '@type': 'aldkg:EntConstr',
+            schema: 'hs:ProductCardShape',
             conditions: {
-              '_@id': 'https://www.wildberries.ru/catalog/zdorove/ozdorovlenie',
+              '@id': 'mktp:ProductCards_in_Category_Coll_Ent0_con',
+              CardInCatLink: 'https://www.wildberries.ru/catalog/zdorove/ozdorovlenie?sort=popular&page=1&xsubject=594',
             },
           },
         ],
-        //orderBy: [{ expression: variable('identifier0'), descending: false }],
+        limit: 1000,
       },
       {
         '@id': 'mktp:Cards_Coll',
@@ -75,6 +99,10 @@ const viewKinds = [
             '@id': 'mktp:Cards_Coll_Ent0',
             '@type': 'aldkg:EntConstr',
             schema: 'hs:ProductCardShape',
+            conditions: {
+              '@id': 'mktp:Cards_Coll_Ent0_con',
+              '@_id': undefined,
+            },
           },
         ],
         //orderBy: [{ expression: variable('identifier0'), descending: false }],
@@ -91,33 +119,34 @@ const viewKinds = [
             height: '100%',
           },
           defaultSize: {
-            'mktp:_85dfg67': '17%',
-            'mktp:_83jdv8': '40%',
-            'mktp:_933ndh8': '43%',
+            'mktp:MarketplacesTabs': '17%',
+            'mktp:CategoryCardsTable': '43%',
+            'mktp:CategoryCardForm': '43%',
           },
           height: 'all-empty-space',
           //width: 'all-empty-space',
         },
         elements: [
           {
-            '@id': 'mktp:_85dfg67',
+            '@id': 'mktp:MarketplacesTabs',
             '@type': 'aldkg:TabsLayout',
             elements: [
               {
                 '@id': 'mktp:_k345jh',
                 '@type': 'aldkg:DataControl',
-                resultsScope: 'mktp:Categories_Coll',
+                resultsScope: 'mktp:HSCategories_Coll',
                 options: {
                   renderType: 'tree',
                   title: 'WildBerries',
                   treeNodeTitleKey: 'name',
                   treeNodeParentKey: 'SubcatInCatLink',
+                  connections: [{ to: 'mktp:ProductCards_in_Category_Coll_Ent0_con', by: 'CardInCatLink' }],
                 },
               },
               {
                 '@id': 'mktp:_876df86',
                 '@type': 'aldkg:DataControl',
-                resultsScope: 'mktp:Categories_Coll',
+                resultsScope: 'mktp:KPCategories_Coll',
                 options: {
                   renderType: 'tree',
                   title: 'Amazon',
@@ -128,7 +157,7 @@ const viewKinds = [
               {
                 '@id': 'mktp:_13hF67',
                 '@type': 'aldkg:DataControl',
-                resultsScope: 'mktp:Categories_Coll',
+                resultsScope: 'mktp:HSCategories_Coll',
                 options: {
                   renderType: 'tree',
                   title: '1688',
@@ -139,25 +168,60 @@ const viewKinds = [
             ],
           },
           {
-            '@id': 'mktp:_83jdv8',
-            '@type': 'aldkg:VerticalLayout',
+            '@id': 'mktp:CategoryCardsTable',
+            '@type': 'aldkg:Array',
+            resultsScope: 'mktp:ProductCards_in_Category_Coll',
             options: {
-              style: {
-                margin: '5px',
+              connections: [{ to: 'mktp:Cards_Coll_Ent0_con', by: '@_id' }],
+              draggable: true,
+              resizeableHeader: true,
+              height: 'all-empty-space',
+              style: { height: '100%' },
+              order: ['imageUrl', 'name', 'price', 'saleValue', 'country', 'brand', 'seller', 'identifier'],
+              imageUrl: {
+                width: 60,
+                formatter: 'image',
+                editable: false,
+              },
+              identifier: {
+                formatter: 'link',
+                //dataToFormatter: { link: 'identifier' },
+                sortable: true,
+                editable: false,
+              },
+              name: {
+                width: 340,
+                formatter: 'link',
+                dataToFormatter: { link: '@id' },
+                sortable: true,
+                editable: false,
+              },
+              country: {
+                width: 60,
+                sortable: true,
+                editable: false,
+              },
+              brand: {
+                formatter: 'link',
+                sortable: true,
+                editable: false,
+              },
+              price: {
+                width: 60,
+                sortable: true,
+                editable: false,
+              },
+              saleValue: {
+                width: 60,
+                sortable: true,
+                editable: false,
+              },
+              seller: {
+                formatter: 'link',
+                sortable: true,
+                editable: false,
               },
             },
-            elements: [
-              {
-                '@id': 'mktp:_986hAty',
-                '@type': 'aldkg:Control',
-                resultsScope: 'mktp:Category_Coll/name',
-              },
-              {
-                '@id': 'mktp:_23jGj2',
-                '@type': 'aldkg:Control',
-                resultsScope: 'mktp:Category_Coll/description',
-              },
-            ],
           },
           {
             '@id': 'mktp:_933ndh8',
@@ -328,7 +392,7 @@ const viewDescrs = [
   {
     '@id': 'mktp:TreeAndFormViewDescr',
     '@type': 'aldkg:ViewDescr',
-    viewKind: 'mktp:TreeAndFormViewKind',
+    viewKind: 'mktp:TreeTableFormMktpCategoriesViewKind',
     title: 'CardCellGrid',
     description: 'CardCellGrid',
     collsConstrs: [],
@@ -363,18 +427,19 @@ const additionalColls: CollState[] = [
 ];
 
 export default {
-  title: 'Several Controls/TreeAndForm Mktp',
+  title: 'Several Controls/Tree-Table-Form',
   component: Form,
   argTypes: {
     backgroundColor: { control: 'color' },
   },
 } as Meta;
 
-export const Empty: Story<{}> = () => {
+export const MktpCategories: Story<{}> = () => {
   const antdRenderers: RendererRegistryEntry[] = [
     ...antdControlRenderers,
     ...antdLayoutRenderers,
     ...antdDataControlRenderers,
+    ...tableRenderers,
   ];
 
   //const client = new SparqlClientImpl('https://rdf4j.agentlab.ru/rdf4j-server');
diff --git a/stories/TwoTablesBig.stories.tsx b/stories/TwoTablesBig.stories.tsx
index ba0879e..b64679c 100644
--- a/stories/TwoTablesBig.stories.tsx
+++ b/stories/TwoTablesBig.stories.tsx
@@ -108,7 +108,7 @@ const viewKinds = [
               },
               defaultSize: {
                 'mktp:MarketplacesTabs': '17%',
-                'mktp:CategoryCardsTable': '43',
+                'mktp:CategoryCardsTable': '43%',
                 'mktp:ProductCardsTable': '26%',
                 'mktp:ProductTree': '17%',
               },
diff --git a/yarn.lock b/yarn.lock
index 4e1e38e..d60279c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,17 +2,17 @@
 # yarn lockfile v1
 
 
-"@agentlab/sparql-jsld-client@^5.0.0-rc.11":
-  version "5.0.0-rc.11"
-  resolved "https://registry.yarnpkg.com/@agentlab/sparql-jsld-client/-/sparql-jsld-client-5.0.0-rc.11.tgz#62c91ea8c79403cf5ac33eeac4c750e9849ada5b"
-  integrity sha512-F627RbXiAKZxPPekKGykzA9/I3CpQEgFgIjGIqs52tW4A6lKYeKJjYJaa5IObhJcdx4AeThGpP+jqqGGPJk/Vg==
+"@agentlab/sparql-jsld-client@^5.0.0-rc.12":
+  version "5.0.0-rc.12"
+  resolved "https://registry.yarnpkg.com/@agentlab/sparql-jsld-client/-/sparql-jsld-client-5.0.0-rc.12.tgz#9e575f9e6e7c9e39c246f411194470e9f4438314"
+  integrity sha512-mHYvlMohQ6+PegbciLVm6dcUJhogT5g81+hd284ooOpQ4Dsxyaye4AyTjyfp/qroOvyOPYwf1HOogPiDVz4twA==
   dependencies:
     "@rdfjs/data-model" "^1.3.3"
     "@types/json-schema" "^7.0.9"
     "@types/lodash-es" "^4.17.4"
     "@types/rdf-js" "^4.0.2"
     "@types/sparqljs" "^3.1.3"
-    axios "^0.21.1"
+    axios "^0.21.4"
     is-url "^1.2.4"
     jsonld "^5.2.0"
     lodash-es "^4.17.21"
@@ -3445,28 +3445,28 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
-  integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==
+"@typescript-eslint/eslint-plugin@^4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz#9c3fa6f44bad789a962426ad951b54695bd3af6b"
+  integrity sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.30.0"
-    "@typescript-eslint/scope-manager" "4.30.0"
+    "@typescript-eslint/experimental-utils" "4.31.0"
+    "@typescript-eslint/scope-manager" "4.31.0"
     debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.1.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5"
-  integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==
+"@typescript-eslint/experimental-utils@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz#0ef1d5d86c334f983a00f310e43c1ce4c14e054d"
+  integrity sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==
   dependencies:
     "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.30.0"
-    "@typescript-eslint/types" "4.30.0"
-    "@typescript-eslint/typescript-estree" "4.30.0"
+    "@typescript-eslint/scope-manager" "4.31.0"
+    "@typescript-eslint/types" "4.31.0"
+    "@typescript-eslint/typescript-estree" "4.31.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -3482,14 +3482,14 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.30.0.tgz#6abd720f66bd790f3e0e80c3be77180c8fcb192d"
-  integrity sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==
+"@typescript-eslint/parser@^4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.0.tgz#87b7cd16b24b9170c77595d8b1363f8047121e05"
+  integrity sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.30.0"
-    "@typescript-eslint/types" "4.30.0"
-    "@typescript-eslint/typescript-estree" "4.30.0"
+    "@typescript-eslint/scope-manager" "4.31.0"
+    "@typescript-eslint/types" "4.31.0"
+    "@typescript-eslint/typescript-estree" "4.31.0"
     debug "^4.3.1"
 
 "@typescript-eslint/scope-manager@4.28.1":
@@ -3500,23 +3500,23 @@
     "@typescript-eslint/types" "4.28.1"
     "@typescript-eslint/visitor-keys" "4.28.1"
 
-"@typescript-eslint/scope-manager@4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee"
-  integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==
+"@typescript-eslint/scope-manager@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz#9be33aed4e9901db753803ba233b70d79a87fc3e"
+  integrity sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==
   dependencies:
-    "@typescript-eslint/types" "4.30.0"
-    "@typescript-eslint/visitor-keys" "4.30.0"
+    "@typescript-eslint/types" "4.31.0"
+    "@typescript-eslint/visitor-keys" "4.31.0"
 
 "@typescript-eslint/types@4.28.1":
   version "4.28.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.1.tgz#d0f2ecbef3684634db357b9bbfc97b94b828f83f"
   integrity sha512-4z+knEihcyX7blAGi7O3Fm3O6YRCP+r56NJFMNGsmtdw+NCdpG5SgNz427LS9nQkRVTswZLhz484hakQwB8RRg==
 
-"@typescript-eslint/types@4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f"
-  integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==
+"@typescript-eslint/types@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.0.tgz#9a7c86fcc1620189567dc4e46cad7efa07ee8dce"
+  integrity sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==
 
 "@typescript-eslint/typescript-estree@4.28.1":
   version "4.28.1"
@@ -3531,13 +3531,13 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac"
-  integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==
+"@typescript-eslint/typescript-estree@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz#4da4cb6274a7ef3b21d53f9e7147cc76f278a078"
+  integrity sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==
   dependencies:
-    "@typescript-eslint/types" "4.30.0"
-    "@typescript-eslint/visitor-keys" "4.30.0"
+    "@typescript-eslint/types" "4.31.0"
+    "@typescript-eslint/visitor-keys" "4.31.0"
     debug "^4.3.1"
     globby "^11.0.3"
     is-glob "^4.0.1"
@@ -3552,12 +3552,12 @@
     "@typescript-eslint/types" "4.28.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.30.0":
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e"
-  integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==
+"@typescript-eslint/visitor-keys@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz#4e87b7761cb4e0e627dc2047021aa693fc76ea2b"
+  integrity sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==
   dependencies:
-    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/types" "4.31.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.0":
@@ -4247,12 +4247,12 @@ axe-core@^4.0.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.3.tgz#2a3afc332f0031b42f602f4a3de03c211ca98f72"
   integrity sha512-pXnVMfJKSIWU2Ml4JHP7pZEPIrgBO1Fd3WGx+fPBsS+KRGhE4vxooD8XBGWbQOIVSZsVK7pUDBBkCicNu80yzQ==
 
-axios@^0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+axios@^0.21.4:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    follow-redirects "^1.10.0"
+    follow-redirects "^1.14.0"
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -7282,10 +7282,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.10.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+follow-redirects@^1.14.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
+  integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
 
 for-in@^1.0.2:
   version "1.0.2"