diff --git a/html/ptg.html b/html/ptg.html
index 8098e99..b7201e2 100644
--- a/html/ptg.html
+++ b/html/ptg.html
@@ -27,12 +27,14 @@
 <div class="panel panel-default">
   <div class="panel-heading"><h3 class="panel-title">Currently playing...</h3></div>
   <table class="table">
-  {{#each now as |what room|}}
+  {{#each rooms as |room| }}
+  {{#if (lookup @root.now room) }}
     <tr>
       <td class="col-sm-1"><span class="label label-primary {{room}}">{{room}}</span></td>
-      <td>{{#hashtag}}{{what}}{{/hashtag}}</td>
+      <td>{{#hashtag}}{{lookup @root.now room}}{{/hashtag}}</td>
       <td>{{lookup @root.location room}}</td>
     </tr>
+  {{/if}}
   {{else}}
     <tr><td><small><i>Nothing yet</i></small><td></tr>
   {{/each}}
@@ -41,15 +43,17 @@
 <div class="panel panel-default">
   <div class="panel-heading"><h3 class="panel-title">Coming up next...</h3></div>
   <table class="table">
-  {{#each next as |sessions room|}}
+  {{#each rooms as |room| }}
+  {{#if (lookup @root.next room) }}
   <tr>
     <td class="col-sm-1"><span class="label label-primary {{room}}">{{room}}</span></td>
     <td>
-    {{#each sessions}}
-      {{#hashtag}}{{this}}{{/hashtag}}<br/>
-    {{/each}}
+      {{#each (lookup @root.next room) as |item|}}
+      {{#hashtag}}{{item}}{{/hashtag}} <br/>
+      {{/each}}
     </td>
   </tr>
+  {{/if}}
   {{else}}
     <tr><td><small><i>Nothing yet</i></small><td></tr>
   {{/each}}
diff --git a/ptgbot/db.py b/ptgbot/db.py
index 71331d2..25f3f80 100644
--- a/ptgbot/db.py
+++ b/ptgbot/db.py
@@ -91,5 +91,6 @@ class PTGDataBase():
             self.data['ethercalc'] = self.ethercalc.load()
         timestamp = datetime.datetime.now()
         self.data['timestamp'] = '{:%Y-%m-%d %H:%M:%S}'.format(timestamp)
+        self.data['rooms'] = sorted(self.data['rooms'])
         with open(self.filename, 'w') as fp:
             json.dump(self.data, fp)