diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 05c6e3c75..901ef6a0a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,6 @@
 7.5.21
+ - fixed: Back to Site link in asset manager points to wrong location
+ - fixed: Some import node folders have invalid template
  - fixed: Scheduled workflows based on day of week run on wrong day
  - improved debug messages for sql queries
  - fixed: Custom library directories don't override WebGUI core modules
diff --git a/docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg
new file mode 100644
index 000000000..f1bebf256
Binary files /dev/null and b/docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg differ
diff --git a/docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg
new file mode 100644
index 000000000..bc9775a14
Binary files /dev/null and b/docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg differ
diff --git a/docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg
new file mode 100644
index 000000000..730d36683
Binary files /dev/null and b/docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg differ
diff --git a/docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg
new file mode 100644
index 000000000..72e752ddc
Binary files /dev/null and b/docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg differ
diff --git a/docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg
new file mode 100644
index 000000000..28bc63468
Binary files /dev/null and b/docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.5.20-7.5.21.pl b/docs/upgrades/upgrade_7.5.20-7.5.21.pl
index 1cef95b54..b56808b28 100644
--- a/docs/upgrades/upgrade_7.5.20-7.5.21.pl
+++ b/docs/upgrades/upgrade_7.5.20-7.5.21.pl
@@ -29,10 +29,25 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
+removeUnusedImportFolder( $session );
 
 finish($session); # this line required
 
 
+#----------------------------------------------------------------------------
+sub removeUnusedImportFolder {
+    my $session = shift;
+    print "\tRemoving legacy folders from Import node if empty... " unless $quiet;
+    for my $assetId (qw(lK9-YMfZ4mpc-Me-UydrFg j3P_Vvsy0OtvUJZRXC55Nw XP2W66c8vtDVpxN50Fiwww JJ-SZb9z2l_N46A0AWW7KA Cn2TOyQH3qqnQrWDrsGrxg sMuqO3Ynl6Lyn5fa2SsGmQ NYr6iP4pQaPRYqEYMryv4w)) {
+        my $asset = WebGUI::Asset->new($session, $assetId);
+        if ($asset->getChildCount == 0) {
+            $asset->purge;
+        }
+    }
+    print "Done.\n" unless $quiet;
+}
+
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 #sub exampleFunction {
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 6951d5be2..741f6208b 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -238,6 +238,7 @@ sub handler {
     my ( $session ) = @_;
  
     if ( $session->form->get( 'op' ) eq 'assetManager' && getCurrentAsset( $session ) ) {
+        $session->asset(getCurrentAsset($session));
 
         return $session->privilege->noAccess unless getCurrentAsset( $session )->canEdit;