diff --git a/maloja/data_files/config/rules/predefined/krateng_jpop.tsv b/maloja/data_files/config/rules/predefined/krateng_jpop.tsv
index cec8553..b6b5794 100644
--- a/maloja/data_files/config/rules/predefined/krateng_jpop.tsv
+++ b/maloja/data_files/config/rules/predefined/krateng_jpop.tsv
@@ -15,3 +15,6 @@ replacetitle	羽根輪舞							Hane Rinbu
 replacetitle	メリーゴーランド						Merry-go-round
 replacetitle	フリイジア						Fressia
 replacetitle	誓い							Chikai
+
+# ReoNa
+replacetitle	ないない							nainai
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index d36f543..acac7b1 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -62,7 +62,7 @@
 			{% endif %}
 		</td>
 		<td class="text">
-			<h1 id="main_entity_name" class="headerwithextra">{{ info.artist }}</h1>
+			<h1 id="main_entity_name" class="headerwithextra">{{ info.artist | e }}</h1>
 				{% if competes %}<span class="rank"><a href="/charts_artists?max=100">#{{ info.position }}</a></span>{% endif %}
 				<br/>
 				{% if competes and included %}
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 3908c16..29cb404 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -60,7 +60,7 @@
 		</td>
 		<td class="text">
 			<span>{{ links.links(track.artists) }}</span><br/>
-			<h1 id="main_entity_name" class="headerwithextra">{{ info.track.title }}</h1>
+			<h1 id="main_entity_name" class="headerwithextra">{{ info.track.title | e }}</h1>
 				{{ awards.certs(track) }}
 				<span class="rank"><a href="/charts_tracks?max=100">#{{ info.position }}</a></span>
 				<br/>