Updates to JSP to fix id