Solve conflict issues - empty output datasets
- set filter for context when saving product