*** Small changes to enable tests
*** Don't show empty table