Add if condition to generate correct paths when a dimension has multiple...

Add if condition to generate correct paths when a dimension has multiple depending dimensions and the 'all' selector is used