Better subscription type decoding