Add query decoding fixes.