diff --git a/panoramix/models.py b/panoramix/models.py
index 12ed8b91b81df..212053bf07d1b 100644
--- a/panoramix/models.py
+++ b/panoramix/models.py
@@ -464,7 +464,7 @@ def query_bkp(
 
     @property
     def sql_url(self):
-        return self.database.sql_url + "?table_id=" + str(self.id)
+        return self.database.sql_url + "?table_name=" + str(self.table_name)
 
     @property
     def sql_link(self):
diff --git a/panoramix/templates/panoramix/sql.html b/panoramix/templates/panoramix/sql.html
index 67c77958f1d51..f21f5a5156888 100644
--- a/panoramix/templates/panoramix/sql.html
+++ b/panoramix/templates/panoramix/sql.html
@@ -54,7 +54,7 @@
   <h2>db: [{{ db }}]</h2>
   <div class="row interactions">
     <div class="col-xs-7 fillheight">
-      <input type="hidden" id="database_id" value="{{ database_id }}">
+      <input type="hidden" id="database_id" value="{{ db.id }}">
       <button class="btn btn-primary" id="run">Run!</button>
       <button class="btn btn-default" id="create_view">Create View</button>
     </div>
@@ -62,7 +62,7 @@ <h2>db: [{{ db }}]</h2>
       <select id="dbtable">
         {% for t in tables %}
           <option value="{{ t }}"
-              {{ "selected" if t == table }}>
+              {{ "selected" if t == table_name else '' }}>
             {{ t }}
           </option>
         {% endfor %}
@@ -75,9 +75,7 @@ <h2>db: [{{ db }}]</h2>
       <textarea id="sql" class="fillup"></textarea>
     </div>
     <div class="col-xs-5 fillheight">
-      <div class="metadata fillup bordered">
-      Tables
-      </div>
+      <div class="metadata fillup bordered"></div>
     </div>
   </div>
   <div id="interactive">
diff --git a/panoramix/views.py b/panoramix/views.py
index d38dec68443ae..7d8f0ce5d24ec 100644
--- a/panoramix/views.py
+++ b/panoramix/views.py
@@ -565,11 +565,12 @@ def sql(self, database_id):
             models.Database).filter_by(id=database_id).first()
         engine = mydb.get_sqla_engine()
         tables = engine.table_names()
+
+        table_name=request.args.get('table_name')
         return self.render_template(
             "panoramix/sql.html",
-            database_id=database_id,
-            table_id=request.args.get('table_id'),
             tables=tables,
+            table_name=table_name,
             db=mydb)
 
     @has_access
@@ -598,7 +599,7 @@ def select_star(self, database_id, table_name):
             models.Database).filter_by(id=database_id).first()
         t = mydb.get_table(table_name)
         fields = ", ".join(
-            [c.name for c in t.get_columns()] or "*")
+            [c.name for c in t.columns] or "*")
         s = "SELECT\n{fields}\nFROM {table_name}".format(**locals())
         return self.render_template(
             "panoramix/ajah.html",