Added escape as variable special symbol
Improved based on test scripts
Added test cases for parse_query