Fixed html escape issues