Fix awful confusion between lookup format and subtable format