Updated comments in query