Partial EntityList tidy