Fix - Fix encoding error for special char in tags