Added 'product' and 'sort-by'