updated the Set function to use the new BuildQuery function
added a helper method to condense the verification process