Save back to Template
fix for handling other pages (mostly)