Close #561. Fix missing query string in parser errors