add sort key back in
use product-specific lookups