diff --git a/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java b/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
index deee534..6096d39 100644
--- a/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
+++ b/src/main/java/com/moandjiezana/tent/essayist/config/EssayistServletContextListener.java
@@ -55,7 +55,6 @@ public class EssayistServletContextListener extends GuiceServletContextListener
     poolProperties.setUrl(properties.getProperty("db.url"));
     poolProperties.setDriverClassName(properties.getProperty("db.driverClassName"));
     poolProperties.setInitialSize(Integer.parseInt(properties.getProperty("db.initialSize")));
-    poolProperties.setJdbcInterceptors(properties.getProperty("db.jdbcInterceptors"));
     
     DataSource dataSource = new DataSource(poolProperties);
     
@@ -88,6 +87,7 @@ public class EssayistServletContextListener extends GuiceServletContextListener
         serve("/write").with(NewEssayServlet.class);
         serveRegex("/(.*)/essays").with(EssaysServlet.class);
         serveRegex("/(.*)/essay/(.*)").with(EssayServlet.class);
+        filter("/*").through(Utf8Filter.class);
       }
     }, new AbstractModule() {
       @Override
diff --git a/src/main/java/com/moandjiezana/tent/essayist/config/Utf8Filter.java b/src/main/java/com/moandjiezana/tent/essayist/config/Utf8Filter.java
new file mode 100644
index 0000000..587300d
--- /dev/null
+++ b/src/main/java/com/moandjiezana/tent/essayist/config/Utf8Filter.java
@@ -0,0 +1,33 @@
+package com.moandjiezana.tent.essayist.config;
+
+import java.io.IOException;
+
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+@Singleton
+public class Utf8Filter implements Filter {
+  
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    HttpServletRequest req = (HttpServletRequest) request;
+    if (!"application/json".equals(req.getHeader("Accept"))) {
+      response.setContentType("text/html;charset=utf-8");
+    }
+    
+    chain.doFilter(request, response);
+  }
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {}
+
+  @Override
+  public void destroy() {}
+
+}