Yes it is still the 2 set limit. Sorry...
But it is good to hear that you are going to join the party moonrise! How cool!
It is a pain when you have to deal with an order like that. ( Been there and got the bumper sticker.... ) I am sorry it is giving you fits.