PIM-2163: Fix issue on mass editing scopable fields