Fix matching of entry by channel or sku only