Reply to APC 40 LED rings problems, HELP!!

I've made an (awesome) mapping for my apc40 - apc20 combination.
I'va got the LED rings to work like intended, or so I thought.
I've got good feedback, pan and volume style. Took a while to figure it out, but now its easy.

Problem comes when using modifiers.
for instance, I've mapped the shift button to modifier one (hold) (I use it like a regular shift, so just modifier1 = 1 or 0)

When modifier 1=0 the track control knobs are the filters for each deck and 4 super knobs.

When modifier 1=1 I can control the master section/record/gains

When I move a knob in any of the modifier states the LED lights change, but when I return to the other modifier state, the lights and thus pot position has changed too. This is a big problem if you change the master out and the filters change too.
This only happens in the hardware, not in the software.

I'm not really new to mapping so I'm sure I'm not messing up modifier states or anything.

and I've got an inverted send monitor state on the modifier button.

What am I doing wrong??