diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
index 89ce305..b54ad5b 100644
--- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
@@ -363,6 +363,7 @@ public class AlbumServlet
try {
Mapper mapper = new Mapper();
res.setContentType("application/json");
+ res.setCharacterEncoding("UTF-8");
PrintWriter out = res.getWriter();
out.println("{");
out.println(" \"name\": " + jsStr(entry.getName()) + ",");
diff --git a/src/main/webapp/WEB-INF/velocity/dynamic.vm b/src/main/webapp/WEB-INF/velocity/dynamic.vm
index a1373ec..b46fe02 100644
--- a/src/main/webapp/WEB-INF/velocity/dynamic.vm
+++ b/src/main/webapp/WEB-INF/velocity/dynamic.vm
@@ -1,12 +1,11 @@
-
-
+
+
$entry.name
-
+