Entity expansions, may fix 2678