diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index b4b6867bcd1b08a6273c6572a01649e8182dc9be..0be9fcd3298d96fc13aa11a4848c02857a9836e4 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -480,38 +480,38 @@
                 <!--<visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>-->
 
                 <separator name="driverGroup" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.new.connection" label="%command.org.jkiss.dbeaver.core.new.connection.name" tooltip="%command.org.jkiss.dbeaver.core.new.connection.description"/>
-                <command commandId="org.jkiss.dbeaver.core.migrate.connection" label="%command.org.jkiss.dbeaver.core.migrate.connection.name" tooltip="%command.org.jkiss.dbeaver.core.migrate.connection.description"/>
-                <command commandId="org.jkiss.dbeaver.core.driver.manager" label="%command.org.jkiss.dbeaver.core.driver.manager.name" tooltip="%command.org.jkiss.dbeaver.core.driver.manager.description"/>
+                <command commandId="org.jkiss.dbeaver.core.new.connection"/>
+                <command commandId="org.jkiss.dbeaver.core.migrate.connection"/>
+                <command commandId="org.jkiss.dbeaver.core.driver.manager"/>
                 <separator name="connection" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.connect" label="%command.org.jkiss.dbeaver.core.connect.name" tooltip="%command.org.jkiss.dbeaver.core.connect.description"/>
-                <command commandId="org.jkiss.dbeaver.core.invalidate" label="%command.org.jkiss.dbeaver.core.invalidate.name" tooltip="%command.org.jkiss.dbeaver.core.invalidate.description"/>
-                <command commandId="org.jkiss.dbeaver.core.disconnect" label="%command.org.jkiss.dbeaver.core.disconnect.name" tooltip="%command.org.jkiss.dbeaver.core.disconnect.description"/>
-                <command commandId="org.jkiss.dbeaver.core.disconnectAll" label="%command.org.jkiss.dbeaver.core.disconnectAll.name" tooltip="%command.org.jkiss.dbeaver.core.disconnectAll.description"/>
+                <command commandId="org.jkiss.dbeaver.core.connect"/>
+                <command commandId="org.jkiss.dbeaver.core.invalidate"/>
+                <command commandId="org.jkiss.dbeaver.core.disconnect"/>
+                <command commandId="org.jkiss.dbeaver.core.disconnectAll"/>
                 <separator name="session" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.commit" label="%command.org.jkiss.dbeaver.core.commit.name">
+                <command commandId="org.jkiss.dbeaver.core.commit">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.rollback" label="%command.org.jkiss.dbeaver.core.rollback.name">
+                <command commandId="org.jkiss.dbeaver.core.rollback">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></visibleWhen>
                 </command>
                 <menu label="%command.org.jkiss.dbeaver.core.transaction_mode.name">
                     <dynamic id="org.jkiss.dbeaver.core.menu.txn" class="org.jkiss.dbeaver.ui.actions.datasource.DataSourceTransactionModeContributor"/>
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></visibleWhen>
                 </menu>
-                <command commandId="org.jkiss.dbeaver.core.txn.log" label="%command.org.jkiss.dbeaver.core.txn.log.name">
+                <command commandId="org.jkiss.dbeaver.core.txn.log">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.txn.pending" label="%command.org.jkiss.dbeaver.core.txn.pending.name">
+                <command commandId="org.jkiss.dbeaver.core.txn.pending">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></visibleWhen>
                 </command>
                 <separator name="transactions" visible="false"/>
                 <separator name="tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.compare.objects" label="%command.org.jkiss.dbeaver.core.compare.objects.name"/>
+                <command commandId="org.jkiss.dbeaver.core.compare.objects"/>
                 <menu label="%menu.database.tools" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/tools.png">
                     <dynamic id="org.jkiss.dbeaver.core.menu.tools" class="org.jkiss.dbeaver.ui.actions.datasource.DataSourceToolsContributor"/>
                 </menu>
-                <command commandId="org.jkiss.dbeaver.ui.tools.menu" label="%command.org.jkiss.dbeaver.ui.tools.menu.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.menu"/>
                 <separator name="additions" visible="false"/>
             </menu>
         </menuContribution>
@@ -519,44 +519,43 @@
         <!-- Database toolbar -->
         <menuContribution allPopups="false" locationURI="toolbar:org.eclipse.ui.main.toolbar?before=additions">
             <toolbar id="dbeaver-general" label="%toolbar.dbeaver-general.label">
-                <command commandId="org.jkiss.dbeaver.core.new.connection" label="%command.org.jkiss.dbeaver.core.new.connection.name" tooltip="%command.org.jkiss.dbeaver.core.new.connection.description">
+                <command commandId="org.jkiss.dbeaver.core.new.connection">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
                 <separator name="sql-tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.connect" label="%command.org.jkiss.dbeaver.core.connect.name">
+                <command commandId="org.jkiss.dbeaver.core.connect">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.invalidate" label="%command.org.jkiss.dbeaver.core.invalidate.name">
+                <command commandId="org.jkiss.dbeaver.core.invalidate">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.disconnect" label="%command.org.jkiss.dbeaver.core.disconnect.name">
+                <command commandId="org.jkiss.dbeaver.core.disconnect">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
                 <separator name="sql-tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.open" label="%command.org.jkiss.dbeaver.core.sql.editor.open.name">
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent" label="%command.org.jkiss.dbeaver.core.sql.editor.recent.name">
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.create" label="%command.org.jkiss.dbeaver.core.sql.editor.create.name">
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.toolbar.general.visible"/></visibleWhen>
                 </command>
                 <separator name="additions" visible="false"/>
             </toolbar>
             <toolbar id="dbeaver-transactions" label="%toolbar.dbeaver-transactions.label">
                 <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
-                <command commandId="org.jkiss.dbeaver.core.commit" label="%command.org.jkiss.dbeaver.core.commit.label" style="push" mode="FORCE_TEXT">
+                <command commandId="org.jkiss.dbeaver.core.commit" style="push" mode="FORCE_TEXT">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.rollback" label="%command.org.jkiss.dbeaver.core.rollbacklabel" style="push" mode="FORCE_TEXT">
+                <command commandId="org.jkiss.dbeaver.core.rollback" style="push" mode="FORCE_TEXT">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
                 <command
                       commandId="org.jkiss.dbeaver.core.txn.autocommit"
                       icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/txn_auto.png"
                       id="org.jkiss.dbeaver.core.menu.txn"
-                      label="%command.org.jkiss.dbeaver.core.txn.autocommit.name"
                       style="pulldown"
                       tooltip="%command.org.jkiss.dbeaver.core.txn.autocommit.description">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
@@ -572,7 +571,6 @@
                 <command
                       commandId="org.jkiss.dbeaver.core.txn.log"
                       id="org.jkiss.dbeaver.core.menu.txn.log"
-                      label="%command.org.jkiss.dbeaver.core.txn.log.name"
                       style="pulldown">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
@@ -584,7 +582,6 @@
                 <command
                       commandId="org.jkiss.dbeaver.ui.editors.sql.sync.connection"
                       id="org.jkiss.dbeaver.core.menu.sql.sync"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.sync.connection.name"
                       style="pulldown">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
@@ -644,11 +641,11 @@
             <menu label="%menu.org.jkiss.dbeaver.core.project.select.label" commandId="org.jkiss.dbeaver.core.project.select">
                 <dynamic id="org.jkiss.dbeaver.core.menu.project.active" class="org.jkiss.dbeaver.ui.navigator.actions.NavigatorActiveProjectContributor"/>
             </menu>
-            <command commandId="org.jkiss.dbeaver.core.new.folder" label="%command.org.jkiss.dbeaver.core.new.folder.name" tooltip="%command.org.jkiss.dbeaver.core.new.folder.description"/>
+            <command commandId="org.jkiss.dbeaver.core.new.folder"/>
             <separator name="additions" visible="true"/>
             <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor" label="%command.org.jkiss.dbeaver.core.navigator.linkeditor.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.linkeditor.description"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences" label="%command.org.jkiss.dbeaver.core.navigator.preferences.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.preferences.description"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.databaseNavigator">
@@ -661,35 +658,33 @@
 
         <!-- Project Navigator menu & toolbar -->
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.projectNavigator">
-            <command commandId="org.jkiss.dbeaver.core.project.create" label="%command.org.jkiss.dbeaver.core.project.create.name" tooltip="%command.org.jkiss.dbeaver.core.project.create.description"/>
-            <command commandId="org.jkiss.dbeaver.core.project.refresh" label="%command.org.jkiss.dbeaver.core.project.refresh.name" tooltip="%command.org.jkiss.dbeaver.core.project.refresh.description"/>
+            <command commandId="org.jkiss.dbeaver.core.project.create"/>
+            <command commandId="org.jkiss.dbeaver.core.project.refresh"/>
             <separator name="additions" visible="true"/>
             <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name" tooltip="%command.org.eclipse.ui.navigate.collapseAll.description"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor" label="%command.org.jkiss.dbeaver.core.navigator.linkeditor.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.linkeditor.description"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences" label="%command.org.jkiss.dbeaver.core.navigator.preferences.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.preferences.description"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectNavigator">
-            <command commandId="org.jkiss.dbeaver.core.project.create" label="%command.org.jkiss.dbeaver.core.project.create.name"/>
+            <command commandId="org.jkiss.dbeaver.core.project.create"/>
             <separator name="additions" visible="true"/>
             <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor" label="%command.org.jkiss.dbeaver.core.navigator.linkeditor.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.linkeditor.description"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences" label="%command.org.jkiss.dbeaver.core.navigator.preferences.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.preferences.description"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
         </menuContribution>
 
         <!-- Project explorer menu & toolbar -->
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectExplorer">
-            <command commandId="org.jkiss.dbeaver.core.navigator.view.configure" label="%command.org.jkiss.dbeaver.core.navigator.view.configure.name" tooltip="%command.org.jkiss.dbeaver.core.navigator.view.configure.description"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.view.configure"/>
             <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name "/>
             <command commandId="org.eclipse.ui.navigate.expandAll" label="%command.org.eclipse.ui.navigate.expandAll.name "/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor" label="%command.org.jkiss.dbeaver.core.navigator.linkeditor.name"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
         </menuContribution>
 
         <!-- All Context menus -->
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=navigator_additions">
-            <command
-                  commandId="org.jkiss.dbeaver.core.connect"
-                  label="%command.org.jkiss.dbeaver.core.connect.name">
+            <command commandId="org.jkiss.dbeaver.core.connect">
                <visibleWhen>
                    <with variable="selection">
                        <count value="1"/>
@@ -699,9 +694,7 @@
                    </with>
                </visibleWhen>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.invalidate"
-                  label="%command.org.jkiss.dbeaver.core.invalidate.name">
+            <command commandId="org.jkiss.dbeaver.core.invalidate">
                 <visibleWhen>
                     <with variable="selection">
                         <count value="1"/>
@@ -711,9 +704,7 @@
                     </with>
                 </visibleWhen>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.disconnect"
-                  label="%command.org.jkiss.dbeaver.core.disconnect.name">
+            <command commandId="org.jkiss.dbeaver.core.disconnect">
                 <visibleWhen>
                     <with variable="selection">
                         <count value="1"/>
@@ -753,20 +744,14 @@
             <command commandId="org.jkiss.dbeaver.core.resource.create.folder">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.resource.link.file"
-                  label="%command.org.jkiss.dbeaver.core.resource.link.file.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.resource.link.file.description">
+            <command commandId="org.jkiss.dbeaver.core.resource.link.file">
                <parameter
                      name="org.jkiss.dbeaver.core.resource.link.file.contenttype"
                      value="org.jkiss.dbeaver.sql">
                </parameter>
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.resource.link.folder"
-                  label="%command.org.jkiss.dbeaver.core.resource.link.folder.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.resource.link.folder.description">
+            <command commandId="org.jkiss.dbeaver.core.resource.link.folder">
                 <visibleWhen checkEnabled="true"/>
             </command>
 
@@ -785,54 +770,37 @@
 
             <separator name="create" visible="false"/>
 
-            <command
-                  commandId="org.jkiss.dbeaver.core.object.open"
-                  label="%command.org.jkiss.dbeaver.core.object.open.name">
+            <command commandId="org.jkiss.dbeaver.core.object.open">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.object.create"
-                  label="%command.org.jkiss.dbeaver.core.object.create.name">
+            <command commandId="org.jkiss.dbeaver.core.object.create">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                  commandId="org.jkiss.dbeaver.core.new.folder"
-                  label="%command.org.jkiss.dbeaver.core.new.folder.name">
+            <command commandId="org.jkiss.dbeaver.core.new.folder">
                 <visibleWhen checkEnabled="true"/>
             </command>
 
-            <command commandId="org.jkiss.dbeaver.core.navigator.open.browser" label="%command.org.jkiss.dbeaver.core.navigator.open.browser.name">
+            <command commandId="org.jkiss.dbeaver.core.navigator.open.browser">
                 <visibleWhen checkEnabled="true"/>
             </command>
 
             <menu
                   icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/filter.png"
                   label="%menu.filter.label">
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.filter.add.exclude"
-                      label="%command.org.jkiss.dbeaver.core.object.filter.add.exclude.name"
-                      tooltip="%command.org.jkiss.dbeaver.core.object.filter.add.exclude.description">
+                <command commandId="org.jkiss.dbeaver.core.object.filter.add.exclude">
                     <visibleWhen checkEnabled="true"/>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.filter.add.include"
-                      label="%command.org.jkiss.dbeaver.core.object.filter.add.include.name">
+                <command commandId="org.jkiss.dbeaver.core.object.filter.add.include">
                     <visibleWhen checkEnabled="true"/>
                 </command>
                 <separator name="filter_config" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.filter.config"
-                      label="%command.org.jkiss.dbeaver.core.object.filter.config.name">
+                <command commandId="org.jkiss.dbeaver.core.object.filter.config">
                     <visibleWhen checkEnabled="true"/>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.filter.toggle"
-                      label="%command.org.jkiss.dbeaver.core.object.filter.toggle.name">
+                <command commandId="org.jkiss.dbeaver.core.object.filter.toggle">
                     <visibleWhen checkEnabled="true"/>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.filter.clear"
-                      label="%command.org.jkiss.dbeaver.core.object.filter.clear.name">
+                <command commandId="org.jkiss.dbeaver.core.object.filter.clear">
                     <visibleWhen checkEnabled="true"/>
                 </command>
             </menu>
@@ -846,9 +814,7 @@
             </command>
 -->
 
-            <command
-                  commandId="org.jkiss.dbeaver.core.sql.script.associate"
-                  label="%command.org.jkiss.dbeaver.core.sql.script.associate.name">
+            <command commandId="org.jkiss.dbeaver.core.sql.script.associate">
                 <visibleWhen checkEnabled="true"/>
             </command>
         </menuContribution>
@@ -858,27 +824,19 @@
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=navigator_additions_end">
             <separator name="copy" visible="true"/>
 
-            <command
-                    commandId="org.eclipse.ui.edit.copy"
-                    label="%command.org.eclipse.ui.edit.copy.name">
+            <command commandId="org.eclipse.ui.edit.copy" label="%command.org.eclipse.ui.edit.copy.name">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                    commandId="org.eclipse.ui.edit.paste"
-                    label="%command.org.eclipse.ui.edit.paste.name">
+            <command commandId="org.eclipse.ui.edit.paste" label="%command.org.eclipse.ui.edit.paste.name">
                 <visibleWhen checkEnabled="true"/>
             </command>
             <command commandId="org.jkiss.dbeaver.core.edit.copy.special" label="%command.org.jkiss.dbeaver.core.edit.copy.adv_info">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                    commandId="org.eclipse.ui.edit.delete"
-                    label="%command.org.eclipse.ui.edit.delete.name">
+            <command commandId="org.eclipse.ui.edit.delete" label="%command.org.eclipse.ui.edit.delete.name">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command
-                    commandId="org.eclipse.ui.edit.rename"
-                    label="%command.org.eclipse.ui.edit.rename.name">
+            <command commandId="org.eclipse.ui.edit.rename" label="%command.org.eclipse.ui.edit.rename.name">
                 <visibleWhen checkEnabled="true"/>
             </command>
         </menuContribution>
@@ -888,21 +846,19 @@
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=tools">
             <separator name="data" visible="true"/>
 
-            <command commandId="org.jkiss.dbeaver.core.procedure.execute" label="%command.org.jkiss.dbeaver.core.procedure.execute.name">
+            <command commandId="org.jkiss.dbeaver.core.procedure.execute">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command commandId="org.jkiss.dbeaver.ui.editors.data.forSelection" label="%command.org.jkiss.dbeaver.ui.editors.data.forSelection.name">
+            <command commandId="org.jkiss.dbeaver.ui.editors.data.forSelection">
                 <visibleWhen checkEnabled="true"/>
             </command>
-            <command commandId="org.jkiss.dbeaver.core.sql.editor.forSelection" label="%command.org.jkiss.dbeaver.core.sql.editor.forSelection.name">
+            <command commandId="org.jkiss.dbeaver.core.sql.editor.forSelection">
                 <visibleWhen checkEnabled="true"/>
             </command>
 
             <separator name="export_import" visible="false"/>
 
-            <command
-                  commandId="org.jkiss.dbeaver.core.compare.objects"
-                  label="%command.org.jkiss.dbeaver.core.compare.objects.name">
+            <command commandId="org.jkiss.dbeaver.core.compare.objects">
                 <visibleWhen checkEnabled="true"/>
             </command>
 
@@ -929,14 +885,8 @@
 
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="navigate" label="%menu.navigate">
-                <command
-                      commandId="org.jkiss.dbeaver.core.object.goto"
-                      label="%command.org.jkiss.dbeaver.core.object.goto.name"
-                      tooltip="%command.org.jkiss.dbeaver.core.object.goto.description"><visibleWhen checkEnabled="true"/></command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.navigate.object"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.navigate.object.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.navigate.object.description">
+                <command commandId="org.jkiss.dbeaver.core.object.goto"><visibleWhen checkEnabled="true"/></command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.navigate.object">
 					  <visibleWhen checkEnabled="true"/>
 			    </command>
             </menu>
@@ -954,83 +904,53 @@
         <!-- SQL editor menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="SQLEditorMenu" label="%menu.sqleditor">
-                <command
-                      commandId="org.jkiss.dbeaver.core.sql.editor.open"
-                      label="%command.org.jkiss.dbeaver.core.sql.editor.open.name"
-                      tooltip="%command.org.jkiss.dbeaver.core.sql.editor.open.description"/>
-                <command
-                      commandId="org.jkiss.dbeaver.core.sql.editor.recent"
-                      label="%command.org.jkiss.dbeaver.core.sql.editor.recent.name"
-                      tooltip="%command.org.jkiss.dbeaver.core.sql.editor.recent.description"/>
-                <command
-                      commandId="org.jkiss.dbeaver.core.sql.editor.create"
-                      label="%command.org.jkiss.dbeaver.core.sql.editor.create.name"
-                      tooltip="%command.org.jkiss.dbeaver.core.sql.editor.create.description"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create"/>
                 <separator name="execute" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.statementNew.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.statementNew.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.script.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.script.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.scriptNew.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.scriptNew.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.count"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.count.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.count.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.all.rows.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.all.rows.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.expression.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.expression.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
@@ -1038,10 +958,7 @@
                     </visibleWhen>
                 </command>
                 <separator name="query" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.explain.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.explain.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
@@ -1049,20 +966,14 @@
                     </visibleWhen>
                 </command>
                 <separator name="files" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.open.file.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.open.file.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
                         </with>
                     </visibleWhen>
                 </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.save.file"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.save.file.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.save.file.description">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file">
                     <visibleWhen>
                         <with variable="activeEditor">
                             <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
@@ -1070,176 +981,85 @@
                     </visibleWhen>
                 </command>
                 <separator name="misc" visible="true"/>
-                <command
-                        commandId="org.jkiss.dbeaver.ui.tools.select.connection"
-                        label="%command.org.jkiss.dbeaver.ui.tools.select.connection.name"
-                        tooltip="%command.org.jkiss.dbeaver.ui.tools.select.connection.description"/>
-                <command
-                        commandId="org.jkiss.dbeaver.ui.tools.select.schema"
-                        label="%command.org.jkiss.dbeaver.ui.tools.select.schema.name"
-                        tooltip="%command.org.jkiss.dbeaver.ui.tools.select.schema.description"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel.description"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel.name"
-                      style="push"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel.description">
-                </command>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.switch.panel.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.switch.panel.description"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel" style="push"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
             </menu>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.additions">
             <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_exec.png">
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.name"
-                      tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.description"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.statementNew.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.script.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.scriptNew.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"/>
                 <separator name="additions_extra" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.count"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.count.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.all.rows.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.expression.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.run.explain.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.export.data"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.export.data.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.export.data"/>
                 <separator name="additions_active_object" visible="true"/>
-                <command
-                        commandId="org.jkiss.dbeaver.ui.tools.select.connection"
-                        label="%command.org.jkiss.dbeaver.ui.tools.select.connection.name"
-                        tooltip="%command.org.jkiss.dbeaver.ui.tools.select.connection.description"/>
-                <command
-                        commandId="org.jkiss.dbeaver.ui.tools.select.schema"
-                        label="%command.org.jkiss.dbeaver.ui.tools.select.schema.name"
-                        tooltip="%command.org.jkiss.dbeaver.ui.tools.select.schema.description"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
             </menu>
             <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label">
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.rename"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.rename.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.rename"/>
                 <command commandId="org.eclipse.ui.file.revert"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.open.file.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.save.file"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.save.file.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file"/>
             </menu>
         </menuContribution>
         <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.extras">
             <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label">
                 <dynamic id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.resultSet.orientation" class="org.jkiss.dbeaver.ui.editors.sql.SQLEditor$ResultSetOrientationMenuContributor"/>
                 <separator name="layout_toggles" visible="true"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel.name"/>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"
-                      label="%command.org.jkiss.dbeaver.ui.editors.sql.switch.panel.name"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
             </menu>
         </menuContribution>
         <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=group.copy">
-            <command commandId="org.jkiss.dbeaver.core.edit.copy.special" label="%command.org.jkiss.dbeaver.core.edit.copy.special.label"/>
+            <command commandId="org.jkiss.dbeaver.core.edit.copy.special"/>
         </menuContribution>
 
         <!-- QM menu & toolbar -->
 
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.queryManager">
-            <command
-                commandId="org.jkiss.dbeaver.core.qm.filter"
-                label="%command.org.jkiss.dbeaver.core.qm.filter.name"
-                tooltip="%command.org.jkiss.dbeaver.core.qm.filter.description"/>
-            <command
-                commandId="org.jkiss.dbeaver.core.qm.clear"
-                label="%command.org.jkiss.dbeaver.core.qm.clear.name"
-                tooltip="%command.org.jkiss.dbeaver.core.qm.clear.description"/>
-            <command
-                commandId="org.eclipse.ui.file.refresh"
-                label="%command.org.jkiss.dbeaver.core.qm.refresh.name"
-                tooltip="%command.org.jkiss.dbeaver.core.qm.refresh.description"/>
+            <command commandId="org.jkiss.dbeaver.core.qm.filter"/>
+            <command commandId="org.jkiss.dbeaver.core.qm.clear"/>
+            <command commandId="org.eclipse.ui.file.refresh" label="%command.org.jkiss.dbeaver.core.qm.refresh.name" tooltip="%command.org.jkiss.dbeaver.core.qm.refresh.description"/>
             <separator name="additions" visible="true"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.queryManager">
-            <command
-                  commandId="org.jkiss.dbeaver.core.qm.filter"
-                  label="%command.org.jkiss.dbeaver.core.qm.filter.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.qm.filter.description"/>
-            <command
-                  commandId="org.jkiss.dbeaver.core.qm.clear"
-                  label="%command.org.jkiss.dbeaver.core.qm.clear.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.qm.clear.description"/>
-            <command
-                    commandId="org.eclipse.ui.file.refresh"
-                    label="%command.org.jkiss.dbeaver.core.qm.refresh.name"
-                    tooltip="%command.org.jkiss.dbeaver.core.qm.refresh.description"/>
+            <command commandId="org.jkiss.dbeaver.core.qm.filter"/>
+            <command commandId="org.jkiss.dbeaver.core.qm.clear"/>
+            <command commandId="org.eclipse.ui.file.refresh" label="%command.org.jkiss.dbeaver.core.qm.refresh.name" tooltip="%command.org.jkiss.dbeaver.core.qm.refresh.description"/>
             <separator name="additions" visible="true"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.shellProcess">
-            <command
-                  commandId="org.jkiss.dbeaver.core.process.stop"
-                  label="%command.org.jkiss.dbeaver.core.process.stop.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.process.stop.description"/>
+            <command commandId="org.jkiss.dbeaver.core.process.stop"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.shellProcess">
-            <command
-                  commandId="org.jkiss.dbeaver.core.process.stop"
-                  label="%command.org.jkiss.dbeaver.core.process.stop.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.process.stop.description"/>
+            <command commandId="org.jkiss.dbeaver.core.process.stop"/>
         </menuContribution>
 
         <!-- SQL editor connection sync drop-down menu -->
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.menu.sql.sync">
-            <command
-                  commandId="org.jkiss.dbeaver.ui.  editors.sql.sync.auto"
-                  label="%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name"
-                  style="toggle"
-                  tooltip="%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.sync.auto" style="toggle"/>
             <separator name="sync_additions" visible="true"/>
-            <command
-                  commandId="org.jkiss.dbeaver.core.navigator.linkeditor"
-                  label="%command.org.jkiss.dbeaver.core.navigator.linkeditor.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.navigator.linkeditor.description"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
         </menuContribution>
 
         <!-- Transaction log menu -->
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.menu.txn.log">
-            <command
-                  commandId="org.jkiss.dbeaver.core.txn.log"
-                  label="%command.org.jkiss.dbeaver.core.txn.log.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.txn.log.description"/>
-            <command
-                  commandId="org.jkiss.dbeaver.core.txn.pending"
-                  label="%command.org.jkiss.dbeaver.core.txn.pending.name"
-                  tooltip="%command.org.jkiss.dbeaver.core.txn.pending.description"/>
+            <command commandId="org.jkiss.dbeaver.core.txn.log"/>
+            <command commandId="org.jkiss.dbeaver.core.txn.pending"/>
             <command commandId="org.eclipse.ui.views.showView" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/qm.png" label="%command.org.eclipse.ui.views.showView.label" style="push">
                 <parameter name="org.eclipse.ui.views.showView.viewId" value="org.jkiss.dbeaver.core.queryManager"/>
             </command>
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tools/ToolsRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tools/ToolsRegistry.java
index 7ca105fdad7197f1f00c928cfb5bf17a895f91e7..b1f4cf28c3a4f33da9cf27120dc715117295de41 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tools/ToolsRegistry.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tools/ToolsRegistry.java
@@ -85,20 +85,22 @@ public class ToolsRegistry
     public List<ToolDescriptor> getTools(IStructuredSelection selection)
     {
         List<DBSObject> objects = NavigatorUtils.getSelectedObjects(selection);
-        List<ToolDescriptor> result = new ArrayList<ToolDescriptor>();
-        for (ToolDescriptor descriptor : tools) {
-            if (descriptor.isSingleton() && objects.size() > 1) {
-                continue;
-            }
-            boolean applies = true;
-            for (DBSObject object : objects) {
-                if (!descriptor.appliesTo(object)) {
-                    applies = false;
-                    break;
+        List<ToolDescriptor> result = new ArrayList<>();
+        if (!objects.isEmpty()) {
+            for (ToolDescriptor descriptor : tools) {
+                if (descriptor.isSingleton() && objects.size() > 1) {
+                    continue;
+                }
+                boolean applies = true;
+                for (DBSObject object : objects) {
+                    if (!descriptor.appliesTo(object)) {
+                        applies = false;
+                        break;
+                    }
+                }
+                if (applies) {
+                    result.add(descriptor);
                 }
-            }
-            if (applies) {
-                result.add(descriptor);
             }
         }
         return result;