Mainstage Midi Controller Problem #2 (New)

Hi, so my Akai MPK61 is working pretty well now but I've got a new problem. I want to set up mainstage presets so that I have 1, 2, 3 or more different instruments/channel strips assigned to the MPK61 keyboard, and then seperate channels strips with ESX24 samples assigned to the pads, all of which can be played individually and/or together. I've done this by assigning the ESX24 samples to the very bottom octave available and then I've got the pads on the 16 MPK assigned to:

"Midi CH 2A, Note 000", "Midi CH 2A, Note 001" through to "Midi CH 2A, Note 015"

Then in the layer editor I've made sure that any keyboard instruments, such as wurlitzer, don't overlap that bottom octave. This has all worked fine until I set up visual drum pads on the mainstage screen which correlate to the pads on the keyboard. These are fairly important as they help me to identify from song to song which pads contain which samples.

Now however some of the keyboard instruments/channels are being triggered by the MPK61 pads even though those keyboard instruments/channels are clearly not layered within the note range allocated to the pads. Even when I drag the layers for those instruments/channels completely up to the top of the keyboard I'm still getting very low notes triggered. I can see a signal in the channel strip and I can solo the channel strip and hear that its being triggered. I did have everything on midi channel 1 and I thought that changing the pads to channel 2 and leaving the keyboard on channel 1 would solve the problem but it has not. I also saw that the latest Mainstage update is supposed to address issues which sound similar but that has not fixed it.

I'm using Mainstage 2.1.3 on a macbook pro OS X10.6.4.

Any help would be greatly appreciated.