Fix for saving templates from a staged page