Fix entity selector