diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py
index 4b150a5..5ceb782 100644
--- a/maloja/database/__init__.py
+++ b/maloja/database/__init__.py
@@ -422,6 +422,7 @@ def get_charts_tracks(dbconn=None,resolve_ids=True,**keys):
 
 @waitfordb
 def get_charts_albums(dbconn=None,resolve_ids=True,only_own_albums=False,**keys):
+	# TODO: different scrobble numbers for only own tracks on own album etc?
 	(since,to) = keys.get('timerange').timestamps()
 
 	if 'artist' in keys:
diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py
index 2952649..0ad0710 100644
--- a/maloja/jinjaenv/context.py
+++ b/maloja/jinjaenv/context.py
@@ -26,8 +26,6 @@ def update_jinja_environment():
 
 	JINJA_CONTEXT = {
 		# maloja
-		"db": database, #TODO: move these to connection manager as well
-		#"dbp":dbp,
 		"malojatime": malojatime,
 		"images": images,
 		"mlj_uri": malojauri,
diff --git a/maloja/web/jinja/charts_albums.jinja b/maloja/web/jinja/charts_albums.jinja
index c442df2..e49be2e 100644
--- a/maloja/web/jinja/charts_albums.jinja
+++ b/maloja/web/jinja/charts_albums.jinja
@@ -8,7 +8,7 @@
 	<script src="/datechange.js" async></script>
 {% endblock %}
 
-{% set charts = dbc.get_charts_albums(filterkeys,limitkeys) %}
+{% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %}
 {% set pages = math.ceil(charts.__len__() / amountkeys.perpage) %}
 {% if charts[0] is defined %}
 	{% set topalbum = charts[0].album %}
diff --git a/maloja/web/jinja/partials/awards_album.jinja b/maloja/web/jinja/partials/awards_album.jinja
index 5ff5850..72a3916 100644
--- a/maloja/web/jinja/partials/awards_album.jinja
+++ b/maloja/web/jinja/partials/awards_album.jinja
@@ -48,7 +48,7 @@
 
 <!-- SUBCERTS -->
 
-{% set charts = db.get_charts_tracks(album=album.album,timerange=malojatime.alltime()) %}
+{% set charts = dbc.get_charts_tracks({'album':album.album,'timerange':malojatime.alltime()}) %}
 {% for e in charts -%}
 	{%- if e.scrobbles >= settings.scrobbles_gold -%}{% set cert = 'gold' %}{%- endif -%}
 	{%- if e.scrobbles >= settings.scrobbles_platinum -%}{% set cert = 'platinum' %}{%- endif -%}
diff --git a/maloja/web/jinja/partials/charts_albums.jinja b/maloja/web/jinja/partials/charts_albums.jinja
index 346250e..8ed758a 100644
--- a/maloja/web/jinja/partials/charts_albums.jinja
+++ b/maloja/web/jinja/partials/charts_albums.jinja
@@ -2,7 +2,7 @@
 {% import 'snippets/entityrow.jinja' as entityrow %}
 
 {% if charts is undefined %}
-	{% set charts = dbc.get_charts_albums(filterkeys,limitkeys) %}
+	{% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %}
 {% endif %}
 {% if compare %}
 	{% if compare is true %}
diff --git a/maloja/web/jinja/partials/charts_albums_tiles.jinja b/maloja/web/jinja/partials/charts_albums_tiles.jinja
index 86f7ba2..538d5b2 100644
--- a/maloja/web/jinja/partials/charts_albums_tiles.jinja
+++ b/maloja/web/jinja/partials/charts_albums_tiles.jinja
@@ -2,7 +2,7 @@
 
 
 {% if charts is undefined %}
-	{% set charts = dbc.get_charts_albums(limitkeys) %}
+	{% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %}
 {% endif %}
 
 {% set charts_14 = charts | fixlength(14) %}