diff --git a/src/client/components/ResultTable.js b/src/client/components/ResultTable.js
index b73816e2866440fcc493af41789038f916af8db9..69565063b53209077704aa207b106826dfe0d5a3 100644
--- a/src/client/components/ResultTable.js
+++ b/src/client/components/ResultTable.js
@@ -151,7 +151,7 @@ class ResultTable extends React.Component {
             <TableFooter>
               <TableRow>
                 <TablePagination
-                  colSpan={3}
+                  component="div"
                   count={results}
                   rowsPerPage={rowsPerPage}
                   rowsPerPageOptions={[5]}
diff --git a/src/server/sparql/Datasets.js b/src/server/sparql/Datasets.js
index 0799fac80e11fbd666192bfe6d2c7a6623950e7a..a72c4eae1e1c3bc07417a756feb39d3d46d074cd 100644
--- a/src/server/sparql/Datasets.js
+++ b/src/server/sparql/Datasets.js
@@ -63,8 +63,11 @@ module.exports = {
           BIND(REPLACE(STR(?author__id), "http://ldf.fi/mmm/person/", "https://sdbm.library.upenn.edu/names/") AS ?author__sdbmLink)
         }
         OPTIONAL {
-          ?expression_creation crm:P4_has_time_span ?timespan__id .
-          ?timespan__id rdfs:label ?timespan__prefLabel.
+          ?expression_creation crm:P4_has_time_span ?timespan .
+          ?timespan rdfs:label ?timespan__id .
+          ?timespan crm:P79_beginning_is_qualified_by ?timespan__start .
+          ?timespan crm:P80_end_is_qualified_by ?timespan__end .
+          BIND (?timespan__id AS ?timespan__prefLabel)
         }
         OPTIONAL {
           ?expression_creation crm:P7_took_place_at ?creationPlace__id .