Updated web.xml and FormEntry