Add support for comments in SOQL block