diff --git a/src/components/presentational/Card/Timestamp.js b/src/components/presentational/Card/Timestamp.js
index 8748e64..c95ed04 100644
--- a/src/components/presentational/Card/Timestamp.js
+++ b/src/components/presentational/Card/Timestamp.js
@@ -8,7 +8,6 @@ const CardTimestamp = ({ timelabel, language, precision }) => {
   // const estimatedLang = copy[language].cardstack.estimated
   const unknownLang = copy[language].cardstack.unknown_time
 
-  console.log(precision)
   if (isNotNullNorUndefined(timelabel)) {
     return (
       <div className='card-cell timestamp'>
diff --git a/src/components/presentational/Timeline/Events.js b/src/components/presentational/Timeline/Events.js
index 0e59a3f..e4a24fb 100644
--- a/src/components/presentational/Timeline/Events.js
+++ b/src/components/presentational/Timeline/Events.js
@@ -78,6 +78,10 @@ const TimelineEvents = ({
     })
   }
 
+  // console.log(datetimes
+  //   .filter(d => d.events.some(e => e.category !== 'Legislation'))
+  // )
+
   return (
     <g
       clipPath={'url(#clip)'}
diff --git a/src/components/presentational/Timeline/ZoomControls.js b/src/components/presentational/Timeline/ZoomControls.js
index 1e551f1..7110c20 100644
--- a/src/components/presentational/Timeline/ZoomControls.js
+++ b/src/components/presentational/Timeline/ZoomControls.js
@@ -1,7 +1,7 @@
 import React from 'react'
 
-function zoomIsActive (duration, extent) {
-  if (duration > 1570000 && extent > 1570000) {
+function zoomIsActive (duration, extent, max) {
+  if (duration >= max && extent >= max) {
     return true
   }
   return duration === extent
@@ -9,7 +9,8 @@ function zoomIsActive (duration, extent) {
 
 const TimelineZoomControls = ({ extent, zoomLevels, dims, onApplyZoom }) => {
   function renderZoom (zoom, idx) {
-    const isActive = zoomIsActive(zoom.duration, extent)
+    const max = zoomLevels.reduce((acc, vl) => acc.duration < vl.duration ? vl : acc)
+    const isActive = zoomIsActive(zoom.duration, extent, max.duration)
     return (
       <text
         className={`zoom-level-button ${isActive ? 'active' : ''}`}
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 06104e6..933fa44 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -38,7 +38,7 @@ export const selectEvents = createSelector(
   [getEvents, getActiveTags, getActiveCategories, getTimeRange],
   (events, activeTags, activeCategories, timeRange) => {
     return events.reduce((acc, event) => {
-      const isMatchingTag = event.tags && event.tags.map(tag => activeTags.includes(tag)).some(s => s)
+      const isMatchingTag = (event.tags && event.tags.map(tag => activeTags.includes(tag)).some(s => s)) || activeTags.length === 0
       const isActiveTag = isMatchingTag || activeTags.length === 0
       const isActiveCategory = activeCategories.includes(event.category) || activeCategories.length === 0
       const isActiveTime = isTimeRangedIn(event, timeRange)
diff --git a/src/store/initial.js b/src/store/initial.js
index 10b5790..1cd9e51 100644
--- a/src/store/initial.js
+++ b/src/store/initial.js
@@ -69,10 +69,12 @@ const initial = {
         trackHeight: 80
       },
       range: [
-        new Date(2013, 2, 23, 12),
-        new Date(2016, 2, 23, 12)
+        new Date(1993, 2, 23, 12),
+        new Date(2023, 2, 23, 12)
       ],
       zoomLevels: [
+        { label: '30 years', duration: 15768000 },
+        { label: '3 years', duration: 1576800 },
         { label: '3 months', duration: 129600 },
         { label: '3 days', duration: 4320 },
         { label: '12 hours', duration: 720 }