Save queries if k2 comments are not used.
Merge pull request #105 from Lemings/patch-1

Save queries if k2 comments are not used.