Patch for UUID Link to better support ET fields.