Improved table guesser