Improving individual delierables query
Show the no rows message if there is not table at all too