Added HTML de/encoding