diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/generic/SQLServerGenericTable.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/generic/SQLServerGenericTable.java
index c821795676e417eb3a6bf7e0a6e2ede5fa07f319..8564d392cd62c25bf63f8875051e595d1df647a3 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/generic/SQLServerGenericTable.java
+++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/generic/SQLServerGenericTable.java
@@ -65,6 +65,7 @@ public class SQLServerGenericTable extends GenericTable implements DBPOverloaded
         return super.getDescription();
     }
 
+    @Override
     @Property(viewable = true, multiline = true, order = 100)
     public String getDescription(DBRProgressMonitor monitor) throws DBException {
         String description = getDescription();
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java
index 90d5e9241d7137b9adf002e28f3585e28f35f38b..48c7b41950a7b6213617ecaf173265f80dcfc472 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java
@@ -142,12 +142,6 @@ public abstract class OracleTableBase extends JDBCTable<OracleDataSource, Oracle
     @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100)
     @LazyProperty(cacheValidator = CommentsValidator.class)
     public String getComment(DBRProgressMonitor monitor) {
-        return getDescription();
-    }
-
-    @Nullable
-    @Override
-    public String getDescription(DBRProgressMonitor monitor) {
         if (comment == null) {
             try (JDBCSession session = DBUtils.openMetaSession(monitor, this, "Load table comments")) {
                 comment = queryTableComment(session);
@@ -161,6 +155,12 @@ public abstract class OracleTableBase extends JDBCTable<OracleDataSource, Oracle
         return comment;
     }
 
+    @Nullable
+    @Override
+    public String getDescription(DBRProgressMonitor monitor) {
+        return getComment(monitor);
+    }
+
     protected String queryTableComment(JDBCSession session) throws SQLException {
         return JDBCUtils.queryString(
             session,
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableColumn.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableColumn.java
index b8773bff659a853dded789da2ee9f5e6f4d5fa0a..4a80583e2992f63f9d498c3a5deed9890093c5ce 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableColumn.java
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableColumn.java
@@ -197,17 +197,17 @@ public class OracleTableColumn extends JDBCTableColumn<OracleTableBase> implemen
     @Nullable
     @Override
     public String getDescription(DBRProgressMonitor monitor) {
-        if (comment == null) {
-            // Load comments for all table columns
-            getTable().loadColumnComments(monitor);
-        }
-        return comment;
+        return getComment(monitor);
     }
 
     @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100)
     @LazyProperty(cacheValidator = CommentLoadValidator.class)
     public String getComment(DBRProgressMonitor monitor) {
-        return getDescription(monitor);
+        if (comment == null) {
+            // Load comments for all table columns
+            getTable().loadColumnComments(monitor);
+        }
+        return comment;
     }
 
     public void setComment(String comment)
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java
index 6912db674d9cfa09766438e2bb8bf437c17820fb..0beb523c4822853acb218edd26f398257f48668b 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java
@@ -18,6 +18,7 @@ package org.jkiss.dbeaver.ext.postgresql.model;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObjectWithLazyDescription;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
@@ -31,7 +32,7 @@ import java.util.List;
 /**
  * PostgreAggregate
  */
-public class PostgreAggregate implements PostgreObject {
+public class PostgreAggregate implements PostgreObject, DBPObjectWithLazyDescription {
 
     private long oid;
     private PostgreSchema schema;
@@ -114,6 +115,7 @@ public class PostgreAggregate implements PostgreObject {
         return null;
     }
 
+    @Override
     @Property(viewable = true, multiline = true, order = 100)
     public String getDescription(DBRProgressMonitor monitor) throws DBException {
         PostgreProcedure function = getFunction(monitor);
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
index 8cd4a13c574221d027fa20b64bad0135cbe2c52d..a32c6c49b921cd3bc42a82b85a357202327eb3d1 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
@@ -270,6 +270,7 @@ public class PostgreDatabase extends JDBCRemoteInstance
         return JDBCExecutionContext.TYPE_METADATA + " <" + getName() + ">";
     }
 
+    @Override
     @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100)
     public String getDescription(DBRProgressMonitor monitor) {
         if (!getDataSource().getServerType().supportsDatabaseDescription()) {
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPObjectWithLazyDescription.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPObjectWithLazyDescription.java
index dbe181b21fe327dc1fd559638eb851a6b5fbde10..0b1746bad40f16d1d1f358ccd1a0de9dd4c70f69 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPObjectWithLazyDescription.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPObjectWithLazyDescription.java
@@ -22,8 +22,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 
 public interface DBPObjectWithLazyDescription extends DBPObjectWithDescription {
     /**
-     * Loads description and returns it. Consequent calls of getDescription()
-     * will return loaded description.
+     * Loads description and returns it.
      *
      * @return object description or null
      */