One more fix about custom query grammar
Merge pull request #1719 from neoascetic/fix_custom_grammar

One more fix about custom query grammar