#40 Comments for queries