fix layer assignments to match legend