Added cancelation of query and updated query field setters
Merge remote-tracking branch 'origin/master'