diff --git a/marietje/stats/utils.py b/marietje/stats/utils.py
index d7ac10b..fd6e1db 100644
--- a/marietje/stats/utils.py
+++ b/marietje/stats/utils.py
@@ -234,20 +234,21 @@ def user_stats(request):
 
     most_played_uploaded_artists = PlaylistSong.objects.filter(
         state=2, song_id__in=Song.objects.filter(user__id=request)).exclude(
-            user__id=None).values('song__artist').annotate(total=Count('song__artist',
-                filter=~Q(user__id=request)), user_total=Count('id',
-                filter=Q(user__id=request))).order_by('-total', 'song__artist')
+            user__id=None).values('song__artist').annotate(total=Count(
+                'song__artist', filter=~Q(user__id=request)), user_total=Count(
+                    'id', filter=Q(user__id=request))).order_by(
+                        '-total','song__artist')
 
     most_played = list(most_played_uploads)
-    total_played_uploads = 0
-    total_played_user_uploads = 0
+    total_played = {}
+    total_played['uploads'] = 0
+    total_played['user_uploads'] = 0
     for x in most_played:
-        total_played_uploads += x['total']
-        total_played_user_uploads += x['user_total']
+        total_played['uploads'] += x['total']
+        total_played['user_uploads'] += x['user_total']
     most_played_uploads_list = sorted(most_played_uploads, key=lambda x: (x['song__artist'], x['song__title']))
     most_played_uploads_list = sorted(most_played_uploads_list, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
-    most_played_uploaded_artists = list(most_played_uploaded_artists)
-    most_played_uploaded_artists_list = sorted(most_played_uploaded_artists, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
+    most_played_uploaded_artists = sorted(list(most_played_uploaded_artists), key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
     return {
         'last_updated': last_updated,
         'total_uploads': total_uploads,
@@ -259,7 +260,7 @@ def user_stats(request):
         'most_played_uploads': most_played_uploads_list,
         'most_played_uploaded_artists': most_played_uploaded_artists_list,
         'stats_top_count': settings.STATS_TOP_COUNT,
-        'total_played_uploads': total_played_uploads,
-        'total_played_user_uploads': total_played_user_uploads,
+        'total_played_uploads': total_played['uploads'],
+        'total_played_user_uploads': total_played['user_uploads'],
         'biggest_fans': list(biggest_fans),
     }