Complete, normalize and fix table of entities