Fixed: i18n issue - Prevent encoding of existing html entities + small fixes