Index: openacs-4/packages/acs-admin/www/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-admin/www/install/install.tcl	25 Nov 2018 02:40:16 -0000	1.13
+++ openacs-4/packages/acs-admin/www/install/install.tcl	13 Mar 2019 09:00:13 -0000	1.13.2.1
@@ -186,12 +186,12 @@
         }
         package_type {
             label "Type"
-            display_eval {[ad_decode $package_type "apm_application" "Application" "Service"]}
+            display_eval {[expr {$package_type eq "apm_application" ? "[_ acs-subsite.Application]" : "[_ acs-admin.Service]"}]}
         }
         upgrade {
             label "Upgrade"
-            hide_p {[ad_decode $upgrades_p 1 0 1]}
-            display_eval {[ad_decode $install_type "upgrade" "Upgrade" ""]}
+            hide_p {[expr {!$upgrades_p}]}
+            display_eval {[expr {$install_type eq "upgrade" ? "Upgrade" : ""}]}
         }
     } -filters {
         channel {
@@ -217,8 +217,8 @@
         package_type {
             label "Type"
             values {
-                {Application apm_application}
-                {Service apm_service}
+                {"[_ acs-subsite.Application]" apm_application}
+                {"[_ acs-admin.Service]" apm_service}
             }
         }
         upgrade_p {