Critical: Delivery tags must be UUID.  Fixes bug that could lead to loss of data
Tests passing