Add QUOTE and fix over html encoding