Remap table names fixed, warnongs for long tables