Fixed some issues with html encoded characters