LP#1402905 Use stricter matching for UPC values