diff --git a/maloja/web/jinja/snippets/entityrow.jinja b/maloja/web/jinja/snippets/entityrow.jinja
index e44f7fd..58fc46c 100644
--- a/maloja/web/jinja/snippets/entityrow.jinja
+++ b/maloja/web/jinja/snippets/entityrow.jinja
@@ -2,14 +2,14 @@
 
 {% import 'snippets/links.jinja' as links %}
 
-{% if 'artists' in entity %}
+{% if entity is mapping and 'artists' in entity %}
 	{% set img = images.get_track_image(entity) %}
 {% else %}
 	{% set img = images.get_artist_image(entity) %}
 {% endif %}
 
 <td class='icon'><div style="background-image:url('{{ img }}')"></div></td>
-{% if "artists" in entity %}
+{% if entity is mapping and 'artists' in entity %}
 	{% if settings['TRACK_SEARCH_PROVIDER'] %}
 		<td class='searchProvider'>{{ links.link_search(entity) }}</td>
 	{% endif %}
diff --git a/maloja/web/jinja/snippets/links.jinja b/maloja/web/jinja/snippets/links.jinja
index f66bd3b..bb014e1 100644
--- a/maloja/web/jinja/snippets/links.jinja
+++ b/maloja/web/jinja/snippets/links.jinja
@@ -1,5 +1,5 @@
 {% macro link(entity) -%}
-	{% if 'artists' in entity %}
+	{% if entity is mapping and 'artists' in entity %}
 		{% set name = entity.title %}
 	{% else %}
 		{% set name = entity %}
@@ -17,7 +17,7 @@
 
 
 {% macro url(entity) %}
-	{% if 'artists' in entity -%}
+	{% if entity is mapping and 'artists' in entity -%}
 		{{ mlj_uri.create_uri("/track",{'track':entity}) }}
 	{%- else -%}
 		{{ mlj_uri.create_uri("/artist",{'artist':entity}) }}