Fixing reference to query values #661
Fixing re-setup issue #658
Merge branch 'develop'