diff --git a/driver/connection.cpp b/driver/connection.cpp
index b437f0996..ff868b711 100644
--- a/driver/connection.cpp
+++ b/driver/connection.cpp
@@ -21,6 +21,7 @@ void Connection::init()
     session.setHost(server);
     session.setPort(port);
     session.setKeepAlive(true);
+    session.setTimeout(Poco::Timespan(30, 0));
     session.setKeepAliveTimeout(Poco::Timespan(86400, 0));
 
     /// TODO Timeout.
diff --git a/driver/odbc.cpp b/driver/odbc.cpp
index 0e239c9ce..4cabe991d 100644
--- a/driver/odbc.cpp
+++ b/driver/odbc.cpp
@@ -682,8 +682,8 @@ SQLTables(HSTMT statement_handle,
 
             if (catalog_name_length)
                 query << " AND TABLE_CAT LIKE '" << stringFromSQLChar(catalog_name, catalog_name_length) << "'";
-            if (schema_name_length)
-                query << " AND TABLE_SCHEM LIKE '" << stringFromSQLChar(schema_name, schema_name_length) << "'";
+            //if (schema_name_length)
+            //    query << " AND TABLE_SCHEM LIKE '" << stringFromSQLChar(schema_name, schema_name_length) << "'";
             if (table_name_length)
                 query << " AND TABLE_NAME LIKE '" << stringFromSQLChar(table_name, table_name_length) << "'";
             //if (table_type_length)