simplify entity expansion