Added html encoding