Move UpdatePubkeyRevsig to query