fix for comments query