I think that from the 3 options mentioned so far, the one Dave proposes is the cleaner. However, is the one that takes more time to implement.
Working with javascript is our current solution, but as Daniël mentioned, sometimes it doesn't work fine on some browsers.
An finally, I prefer not to work with cookies if I can ;o)
There was another idea we *thought* some time ago, and it was to modify the master-template adding a flag to it, and somehow, if the flag was set to true, for instance, do not take the master-template from the parameter, but from another location, or simply, do not get/show the master-template at all.
