- Fixes an issue whereby HDR10+ is matched in both CFs (normal too) because it's also recognized as generic HDR - Create new regex + CF for generic HDR match