Fix entity ... s/&/&