diff --git a/modules/data.js b/modules/data.js
index f2acfa0..17985c0 100644
--- a/modules/data.js
+++ b/modules/data.js
@@ -70,7 +70,9 @@ function getObjectsInGalleryStats(callback) {
 function getCurrentExhibitions(callback) {
   const params = {
     venue: 'HAM',
-    status: 'current'
+    status: 'current',
+    sort: 'enddate',
+    sortorder: 'asc'
   };
   const url = makeURL('exhibition', params);
 
@@ -84,7 +86,9 @@ function getCurrentExhibitions(callback) {
 function getUpcomingExhibitions(callback) {
   const params = {
     venue: 'HAM',
-    status: 'upcoming'
+    status: 'upcoming',
+    sort: 'begindate',
+    sortorder: 'asc'
   };
   const url = makeURL('exhibition', params);
 
diff --git a/views/production.hbs b/views/production.hbs
index 037bc51..924b918 100644
--- a/views/production.hbs
+++ b/views/production.hbs
@@ -72,18 +72,26 @@
                 <h2 class="card-title">Current Exhibitions</h2>
 
                 <ul class="list-group">
-                    {{#each apistats.exhibitions.current}}
-                        <li class="list-group-item"><a href="{{url}}">{{title}}</a> <br/><span class="figure-caption">Closes on {{enddate}}</span></li>
-                    {{/each}}
+                    {{#if apistats.exhibitions.current.length}}
+                        {{#each apistats.exhibitions.current}}
+                            <li class="list-group-item"><a href="{{url}}">{{title}}</a> <br/><span class="figure-caption">closes on {{enddate}}</span></li>
+                        {{/each}}
+                    {{else}}
+                        <li class="list-group-item">No current exhibitions</li>
+                    {{/if}}                        
                 </ul>
             </div>
             <div class="card-body">
                 <h2 class="card-title">Upcoming Exhibitions</h2>
 
                 <ul class="list-group">
-                    {{#each apistats.exhibitions.upcoming}}
-                        <li class="list-group-item"><a href="{{url}}">{{title}}</a> <br/><span class="figure-caption">Opens on {{begindate}}</span></li>
-                    {{/each}}
+                    {{#if apistats.exhibitions.upcoming.length}}
+                        {{#each apistats.exhibitions.upcoming}}
+                            <li class="list-group-item"><a href="{{url}}">{{title}}</a> <br/><span class="figure-caption">opens on {{begindate}}</span></li>
+                        {{/each}}
+                    {{else}}
+                        <li class="list-group-item">No upcoming exhibitions</li>
+                    {{/if}}
                 </ul>
             </div>            
         </div>