Order of entities now matches files, even after update