reporting: simplify table code
reporting: fix display