Do the query values need to be encoded here?