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

Hi guys - one more bug fix while I'm at it.