Correct more cases of addresse (no "s"), & in entity file