Better view when no results in the table view -- See #1698
Grammar fix
Merge branch 'michel_1698_empty' into next