More improvement on entity selector.