Fix UDI decoding issues

This update includes:


Ready to start scanning?