a little clean up of EncodedQuery in signature.go