Refactor ComboServlet