Continued Work on report-table.html.tmpl