proper fix for queries with leading comment
Merge branch 'u/jbecla/DM-1614'