diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py
index 5bd12ee..e2ba377 100644
--- a/maloja/__pkginfo__.py
+++ b/maloja/__pkginfo__.py
@@ -5,7 +5,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,9,7
+version = 2,9,8
 versionstr = ".".join(str(n) for n in version)
 links = {
 	"pypi":"malojaserver",
diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja
index 6e60d03..d7dc648 100644
--- a/maloja/web/jinja/charts_artists.jinja
+++ b/maloja/web/jinja/charts_artists.jinja
@@ -27,8 +27,9 @@
 			<h1>Artist Charts</h1><a href="/top_artists"><span>View #1 Artists</span></a><br/>
 			<span>{{ limitkeys.timerange.desc(prefix=True) }}</span>
 			<br/><br/>
-			{% import 'snippets/timeselection.jinja' as timeselection %}
-			{{ timeselection.selector(filterkeys,limitkeys,delimitkeys) }}
+			{% with delimitkeys = {} %}
+			{% include 'snippets/timeselection.jinja' %}
+			{% endwith %}
 
 		</td>
 	</tr>
diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja
index 032681a..31f7e09 100644
--- a/maloja/web/jinja/charts_tracks.jinja
+++ b/maloja/web/jinja/charts_tracks.jinja
@@ -29,8 +29,9 @@
 			{% if filterkeys.get('artist') is not none %}by {{ links.link(filterkeys.get('artist')) }}{% endif %}
 			<span>{{ limitkeys.timerange.desc(prefix=True) }}</span>
 			<br/><br/>
-			{% import 'snippets/timeselection.jinja' as timeselection %}
-			{{ timeselection.selector(filterkeys,limitkeys,delimitkeys) }}
+			{% with delimitkeys = {} %}
+			{% include 'snippets/timeselection.jinja' %}
+			{% endwith %}
 
 		</td>
 	</tr>
diff --git a/maloja/web/jinja/performance.jinja b/maloja/web/jinja/performance.jinja
index c5e4321..a30eb7d 100644
--- a/maloja/web/jinja/performance.jinja
+++ b/maloja/web/jinja/performance.jinja
@@ -25,8 +25,7 @@
 					<br/>
 					{{ filterdesc.desc(filterkeys,limitkeys,prefix='of') }}
 					<br/><br/>
-					{% import 'snippets/timeselection.jinja' as timeselection %}
-					{{ timeselection.selector(filterkeys,limitkeys,delimitkeys,delimit=True) }}
+					{% include 'snippets/timeselection.jinja' %}
 
 				</td>
 			</tr>
diff --git a/maloja/web/jinja/pulse.jinja b/maloja/web/jinja/pulse.jinja
index dd3f1f3..08ac85f 100644
--- a/maloja/web/jinja/pulse.jinja
+++ b/maloja/web/jinja/pulse.jinja
@@ -25,8 +25,7 @@
 					<br/>
 					{{ filterdesc.desc(filterkeys,limitkeys,prefix='of') }}
 					<br/><br/>
-					{% import 'snippets/timeselection.jinja' as timeselection %}
-					{{ timeselection.selector(filterkeys,limitkeys,delimitkeys,delimit=True) }}
+					{% include 'snippets/timeselection.jinja' %}
 
 				</td>
 			</tr>
diff --git a/maloja/web/jinja/scrobbles.jinja b/maloja/web/jinja/scrobbles.jinja
index 16fe9f7..062cb90 100644
--- a/maloja/web/jinja/scrobbles.jinja
+++ b/maloja/web/jinja/scrobbles.jinja
@@ -31,8 +31,9 @@
 				<br/>
 				<p class="stats">{{ scrobbles.__len__() }} Scrobbles</p>
 				<br/>
-				{% import 'snippets/timeselection.jinja' as timeselection %}
-				{{ timeselection.selector(filterkeys,limitkeys,delimitkeys) }}
+				{% with delimitkeys = {} %}
+				{% include 'snippets/timeselection.jinja' %}
+				{% endwith %}
 
 			</td>
 		</tr>
diff --git a/maloja/web/jinja/snippets/timeselection.jinja b/maloja/web/jinja/snippets/timeselection.jinja
index 03a2b9c..fec4bd2 100644
--- a/maloja/web/jinja/snippets/timeselection.jinja
+++ b/maloja/web/jinja/snippets/timeselection.jinja
@@ -1,13 +1,10 @@
-{% macro selector(filterkeys,limitkeys,delimitkeys,amountkeys,limit=True,delimit=False) %}
 
-	<!-- drop keys that are not relevant so they don't clutter the URI -->
-	{% if not limit %}{% set limitkeys = {} %}{% endif %}
-	{% if not delimit %}{% set delimitkeys = {} %}{% endif %}
+
 
 	{% set allkeys = [filterkeys,limitkeys,delimitkeys,amountkeys] | combine_dicts %}
 
 
-	{% if limit %}
+	{% if limitkeys != {} %}
 
 		<div>
 			{% set thisrange = limitkeys.timerange %}
@@ -42,7 +39,7 @@
 	{% endif %}
 
 
-	{% if delimit %}
+	{% if delimitkeys != {} %}
 		<div>
 			{% for cat in [xdelimiters,xtrails] %}
 				{% for r in cat %}
@@ -59,6 +56,3 @@
 		</div>
 
 	{% endif %}
-
-
-{% endmacro %}
diff --git a/maloja/web/jinja/top_artists.jinja b/maloja/web/jinja/top_artists.jinja
index a00512d..bb0c3d3 100644
--- a/maloja/web/jinja/top_artists.jinja
+++ b/maloja/web/jinja/top_artists.jinja
@@ -20,8 +20,7 @@
 					<span>{{ limitkeys.timerange.desc(prefix=True) }}</span>
 
 					<br/><br/>
-					{% import 'snippets/timeselection.jinja' as timeselection %}
-					{{ timeselection.selector(filterkeys,limitkeys,delimitkeys,delimit=True) }}
+					{% include 'snippets/timeselection.jinja' %}
 				</td>
 			</tr>
 		</table>
diff --git a/maloja/web/jinja/top_tracks.jinja b/maloja/web/jinja/top_tracks.jinja
index 961adb8..cdc66cd 100644
--- a/maloja/web/jinja/top_tracks.jinja
+++ b/maloja/web/jinja/top_tracks.jinja
@@ -20,8 +20,7 @@
 					<span>{{ limitkeys.timerange.desc(prefix=True) }}</span>
 
 					<br/><br/>
-					{% import 'snippets/timeselection.jinja' as timeselection %}
-					{{ timeselection.selector(filterkeys,limitkeys,delimitkeys,delimit=True) }}
+					{% include 'snippets/timeselection.jinja' %}
 				</td>
 			</tr>
 		</table>