improve enhanced ecommerce parameter matching