replaced mapping, made product name a link