Add query decoding conveniences