refactor AdminServlet and PublicContentServlet