diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py
index 5ceb782..71c2d5e 100644
--- a/maloja/database/__init__.py
+++ b/maloja/database/__init__.py
@@ -427,7 +427,8 @@ def get_charts_albums(dbconn=None,resolve_ids=True,only_own_albums=False,**keys)
 
 	if 'artist' in keys:
 		result = sqldb.count_scrobbles_by_album_combined(since=since,to=to,artist=keys['artist'],associated=keys.get('associated',False),resolve_ids=resolve_ids,dbconn=dbconn)
-		result = [e for e in result if (not only_own_albums) or (keys['artist'] in (e['album']['artists'] or []))]
+		if only_own_albums:
+			result = [e for e in result if keys['artist'] in (e['album']['artists'] or [])]
 	else:
 		result = sqldb.count_scrobbles_by_album(since=since,to=to,resolve_ids=resolve_ids,dbconn=dbconn)
 	return result
diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py
index ec15b24..de6b4e4 100644
--- a/maloja/database/sqldb.py
+++ b/maloja/database/sqldb.py
@@ -323,6 +323,7 @@ def album_dict_to_db(info,dbconn=None):
 
 ##### Actual Database interactions
 
+# TODO: remove all resolve_id args and do that logic outside the caching
 
 @connection_provider
 def add_scrobble(scrobbledict,update_album=False,dbconn=None):