Fixed with comments query spec