Updates to ParseQuery