We could probably do with some additional test cases in the test app to cover scenarios like empty tables. Will put some together when I review/merge.