Cleanup output table view a bit
Add a joinedload to speed up the address view