Added more query comments