diff --git a/src/generators/postgresqlgenerator.cpp b/src/generators/postgresqlgenerator.cpp
index a6d368d..e1da1c2 100644
--- a/src/generators/postgresqlgenerator.cpp
+++ b/src/generators/postgresqlgenerator.cpp
@@ -170,7 +170,7 @@ QString PostgreSqlGenerator::fieldType(FieldModel *field)
     case QMetaType::QJsonValue:
     case QMetaType::QJsonObject:
     case QMetaType::QJsonDocument:
-        return "JSON";
+        return "JSONB";
 
     case QMetaType::QStringList:
         return "TEXT[]";
diff --git a/src/generators/sqlgeneratorbase_p.h b/src/generators/sqlgeneratorbase_p.h
index 9c9bf1a..e6acf73 100644
--- a/src/generators/sqlgeneratorbase_p.h
+++ b/src/generators/sqlgeneratorbase_p.h
@@ -159,6 +159,9 @@ protected:
     QString agregateText(const AgregateType &t, const QString &arg = QString()) const;
     QString fromTableText(const QString &tableName, QString &joinClassName, QString &orderBy) const;
 //    QString createWhere(QList<WherePhrase> &wheres);
+
+    void replaceTableNames(QString &command);
+    void removeTableNames(QString &command);
 };
 
 NUT_END_NAMESPACE
diff --git a/src/generators/sqlservergenerator.cpp b/src/generators/sqlservergenerator.cpp
index 3b1d2e9..0731b59 100644
--- a/src/generators/sqlservergenerator.cpp
+++ b/src/generators/sqlservergenerator.cpp
@@ -186,11 +186,4 @@ void SqlServerGenerator::appendSkipTake(QString &sql, int skip, int take)
                    .arg(skip).arg(take));
 }
 
-void SqlServerGenerator::replaceTableNames(QString &command)
-{
-    foreach (TableModel *m, TableModel::allModels())
-        command = command
-                .replace("[" + m->className() + "]", m->name() );
-}
-
 NUT_END_NAMESPACE
diff --git a/src/query.h b/src/query.h
index 17738a1..b535df3 100644
--- a/src/query.h
+++ b/src/query.h
@@ -177,7 +177,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
     d->sql = d->database->sqlGenertor()->selectCommand(
                 d->tableName, d->fieldPhrase, d->wherePhrase, d->orderPhrase,
                 d->relations, d->skip, d->take);
-qDebug()<<d->sql;
+
     QSqlQuery q = d->database->exec(d->sql);
     if (q.lastError().isValid()) {
         qDebug() << q.lastError().text();