Fix end-of-line comments breaking the query