add query and comment