Fixed Freemarker fields and footer

Updates