I fudged the last commit. You can't search for table cells anymore without this fix.