Only apply layer controls to current data, not display [1522]