More EntityList tidy