More reliable detection of table ending marker
More pickiness over WikiWords