fixed queries with comment