Fixes for Folder Mode, Templates have a supported return capability now.