diff --git a/maloja/data_files/rules/predefined/krateng_cpop.tsv b/maloja/data_files/rules/predefined/krateng_cpop.tsv
index 8c7deaa..1007f49 100644
--- a/maloja/data_files/rules/predefined/krateng_cpop.tsv
+++ b/maloja/data_files/rules/predefined/krateng_cpop.tsv
@@ -12,3 +12,4 @@ countas			Dai Meng						SNH48
 countas			Mo Han							SNH48
 countas			Su Shanshan						SNH48
 countas			Lin Hui							S.I.N.G.
+replaceartist	鞠婧禕							Ju Jungyi
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index 237e859..802fed5 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -74,9 +74,10 @@
 
 <h2><a href='{{ mlj_uri.create_uri("/charts_tracks",filterkeys) }}'>Top Tracks</a></h2>
 
-{% import 'partials/charts_tracks.jinja' as charts_tracks %}
 
-{{ charts_tracks.charts_tracks(filterkeys,limitkeys,{"perpage":15,"page":0},compare=false) }}
+{% with amountkeys={"perpage":15,"page":0} %}
+{% include 'partials/charts_tracks.jinja' %}
+{% endwith %}
 
 <br/>
 
diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja
index f55e9b1..6e60d03 100644
--- a/maloja/web/jinja/charts_artists.jinja
+++ b/maloja/web/jinja/charts_artists.jinja
@@ -39,8 +39,9 @@
 	<br/><br/>
 {% endif %}
 
-{% import 'partials/charts_artists.jinja' as charts_artists %}
-{{ charts_artists.charts_artists(limitkeys,amountkeys,compare=true) }}
+{% with compare=true %}
+{% include 'partials/charts_artists.jinja' %}
+{% endwith %}
 
 {% import 'snippets/pagination.jinja' as pagination %}
 {{ pagination.pagination(filterkeys,limitkeys,delimitkeys,amountkeys,pages) }}
diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja
index d3223d3..032681a 100644
--- a/maloja/web/jinja/charts_tracks.jinja
+++ b/maloja/web/jinja/charts_tracks.jinja
@@ -41,8 +41,9 @@
 	<br/><br/>
 {% endif %}
 
-{% import 'partials/charts_tracks.jinja' as charts_tracks %}
-{{ charts_tracks.charts_tracks(filterkeys,limitkeys,amountkeys,charts=charts,compare=true) }}
+{% with compare=true %}
+{% include 'partials/charts_tracks.jinja' %}
+{% endwith %}
 
 {% import 'snippets/pagination.jinja' as pagination %}
 {{ pagination.pagination(filterkeys,limitkeys,delimitkeys,amountkeys,pages) }}
diff --git a/maloja/web/jinja/partials/charts_artists.jinja b/maloja/web/jinja/partials/charts_artists.jinja
index 3b3fdae..504a093 100644
--- a/maloja/web/jinja/partials/charts_artists.jinja
+++ b/maloja/web/jinja/partials/charts_artists.jinja
@@ -1,9 +1,7 @@
 {% import 'snippets/links.jinja' as links %}
 {% import 'snippets/entityrow.jinja' as entityrow %}
 
-{% macro charts_artists(limitkeys,amountkeys,charts=None,compare=False) %}
-
-{% if charts is none %}
+{% if charts is undefined %}
 	{% set charts = dbp.get_charts_artists(limitkeys) %}
 {% endif %}
 
@@ -59,7 +57,3 @@
 		{% endif %}
 	{% endfor %}
 </table>
-
-
-
-{%- endmacro %}
diff --git a/maloja/web/jinja/partials/charts_tracks.jinja b/maloja/web/jinja/partials/charts_tracks.jinja
index e608138..24734c8 100644
--- a/maloja/web/jinja/partials/charts_tracks.jinja
+++ b/maloja/web/jinja/partials/charts_tracks.jinja
@@ -1,9 +1,7 @@
 {% import 'snippets/links.jinja' as links %}
 {% import 'snippets/entityrow.jinja' as entityrow %}
 
-{% macro charts_tracks(filterkeys,limitkeys,amountkeys,charts=None,compare=False) %}
-
-{% if charts is none %}
+{% if charts is undefined %}
 	{% set charts = dbp.get_charts_tracks(filterkeys,limitkeys) %}
 {% endif %}
 {% if compare %}
@@ -56,7 +54,3 @@
 		{% endif %}
 	{% endfor %}
 </table>
-
-
-
-{%- endmacro %}