Merge pull request #709 from Arantor/release-2.1

! As per #708 this should fix some of the cases where queries were being...