Clean the scenario to link option value to product
Remove useless scenario and fix regex in datagrid context