diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py
index 8153356..52ca949 100644
--- a/maloja/database/__init__.py
+++ b/maloja/database/__init__.py
@@ -141,11 +141,11 @@ def get_scrobbles_num(dbconn=None,**keys):
 	return len(get_scrobbles(dbconn=dbconn,**keys))
 
 @waitfordb
-def get_tracks(dbconn=None,artist=None):
-	if artist is None:
+def get_tracks(dbconn=None,**keys):
+	if keys.get('artist') is None:
 		result = sqldb.get_tracks(dbconn=dbconn)
 	else:
-		result = sqldb.get_tracks_of_artist(artist,dbconn=dbconn)
+		result = sqldb.get_tracks_of_artist(keys.get('artist'),dbconn=dbconn)
 	return result
 
 @waitfordb
@@ -240,7 +240,9 @@ def get_top_tracks(dbconn=None,**keys):
 	return results
 
 @waitfordb
-def artist_info(artist,dbconn=None):
+def artist_info(dbconn=None,**keys):
+
+	artist = keys.get('artist')
 
 	artist = sqldb.get_artist(sqldb.get_artist_id(artist,dbconn=dbconn),dbconn=dbconn)
 	alltimecharts = get_charts_artists(timerange=alltime(),dbconn=dbconn)
@@ -274,7 +276,9 @@ def artist_info(artist,dbconn=None):
 
 
 @waitfordb
-def track_info(track,dbconn=None):
+def track_info(dbconn=None,**keys):
+
+	track = keys.get('track')
 
 	track = sqldb.get_track(sqldb.get_track_id(track,dbconn=dbconn),dbconn=dbconn)
 	alltimecharts = get_charts_tracks(timerange=alltime(),dbconn=dbconn)
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index 5c03d41..458f6f0 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% set artist = filterkeys.artist %}
-{% set info = db.artist_info(artist) %}
+{% set info = db.artist_info(artist=artist) %}
 
 {% set credited = info.get('replace') %}
 {% set included = info.get('associated') %}
diff --git a/maloja/web/jinja/partials/awards_track.jinja b/maloja/web/jinja/partials/awards_track.jinja
index 3a860b9..12a1948 100644
--- a/maloja/web/jinja/partials/awards_track.jinja
+++ b/maloja/web/jinja/partials/awards_track.jinja
@@ -53,7 +53,7 @@
 
 <!-- CERTS -->
 
-{% set info = db.track_info(track) %}
+{% set info = db.track_info(track=track) %}
 {% if info.certification is not none %}
 	<img class="certrecord"
 				src="/media/record_{{ info.certification }}.png"
diff --git a/maloja/web/jinja/start.jinja b/maloja/web/jinja/start.jinja
index 0c0d112..424ac86 100644
--- a/maloja/web/jinja/start.jinja
+++ b/maloja/web/jinja/start.jinja
@@ -68,7 +68,7 @@
 
 			{% for range in xcurrent %}
 				<span class="stats">{{ range.localisation }}</span>
-				<a href='/scrobbles?in={{ range.identifier }}'>{{ db.get_scrobbles_num(timerange=range.range) }}</a>
+				<a href='/scrobbles?in={{ range.identifier }}'>{{ dbc.get_scrobbles_num({'timerange':range.range}) }}</a>
 			{% endfor %}
 			<br/><br/>
 
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 2b586a6..e74ce94 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% set track = filterkeys.track %}
-{% set info = db.track_info(track) %}
+{% set info = dbc.track_info({'track':track}) %}
 
 {% set initialrange ='month' %}