added removing special entities