Improved messages shown when there are no items in table

This is update up to commit 17df98e65bc8a8e95302bacad25e1b8d50b7358f