Properly escape all required chars
Integrated escaping into parser