Fix Remap-Through-Base-Layer functionality

Fix remap through base layer so it doesn't get the base layer based on the potentially mapped dimensiongroup of a channel, but uses the dimension group of the primary channel layer instead.