Fix entity selection on analysis embedding