f4a2679177
Correctly handle audio number tag fallbacks
Original-merge: 117d2082aa
Merged-by: joshuaboniface <joshua@boniface.me>
Backported-by: Bond_009 <bond.009@outlook.com>