handle comment in queries