minor fix: span in table head and simplify address display