Index: branches/release-34/tmpl/cms/include/template_table.tmpl
===================================================================
--- branches/release-34/tmpl/cms/include/template_table.tmpl (revision 1786)
+++ branches/release-34/tmpl/cms/include/template_table.tmpl (revision 1877)
@@ -80,5 +80,5 @@
             <mt:loop name="archive_types">
                 <mt:loop name="archive_tmpl_loop">
-                        <li><mt:if name="selected"><mt:var name="name" escape="html"></mt:if></li>
+                        <li><mt:if name="selected"><mt:var name="name" escape="html"><mt:var name="build_type" value="$map_build_type"></mt:if></li>
                 </mt:loop>
             </mt:loop>
@@ -94,11 +94,12 @@
     <mt:if name="template_type" like="/(index|archive)/">
                 <td class="publishing-method">
-                    <mt:if name="build_type" eq="0"><__trans phrase="Disabled">
-                    <mt:else name="build_type" eq="2"><__trans phrase="Manual">
-                    <mt:else name="build_type" eq="3"><__trans phrase="Dynamic">
-                    <mt:else name="build_type" eq="4"><__trans phrase="Asynchronous">
-                    <mt:else name="build_type" eq="5"><__trans phrase="Scheduled">
+                    <mt:if name="build_dynamic"><__trans phrase="Dynamic"><mt:else>
+                    <mt:if name="build_type" eq="0"><__trans phrase="Manual">
+                    <mt:elseif name="build_type" eq="2"><__trans phrase="Manual">
+                    <mt:elseif name="build_type" eq="3"><__trans phrase="Dynamic">
+                    <mt:elseif name="build_type" eq="4"><__trans phrase="Background">
+                    <mt:elseif name="build_type" eq="5"><__trans phrase="Scheduled">
                     <mt:else><__trans phrase="Static">
-                    </mt:if>
+                    </mt:if></mt:if>
                 </td>
     </mt:if>
Index: branches/release-34/tmpl/cms/include/archive_maps.tmpl
===================================================================
--- branches/release-34/tmpl/cms/include/archive_maps.tmpl (revision 1632)
+++ branches/release-34/tmpl/cms/include/archive_maps.tmpl (revision 1877)
@@ -28,15 +28,12 @@
             </td>
             <td class="publish-options">
-                <select name="build_type" id="build-type" class="half-width">
-                    <option value="1"<mt:if name="build_type_1"> selected="selected"</mt:if>><__trans phrase="Statically"></option>
-
-                <mt:if name="custom_dynamic">
-                    <option value="3"<mt:if name="build_type_3"> selected="selected"</mt:if>><__trans phrase="Dynamically"></option>
-                </mt:if>
-                <mt:if name="publish_queue">
-                    <option value="4"<mt:if name="build_type_4"> selected="selected"</mt:if>><__trans phrase="Asynchronously"></option>
+                <select name="map_build_type_<mt:var name="map_id">" id="build-type" class="half-width">
+                    <option value="1"<mt:if name="map_build_type_1"> selected="selected"</mt:if>><__trans phrase="Statically"></option>
+                    <option value="3"<mt:if name="map_build_type_3"> selected="selected"</mt:if>><__trans phrase="Dynamically"></option>
+    <mt:if name="publish_queue_available">
+                    <option value="4"<mt:if name="map_build_type_4"> selected="selected"</mt:if>><__trans phrase="Background"></option>
         <mt:ignore>
             <!-- untested features -->
-                    <option value="5"<mt:if name="build_type_5"> selected="selected"</mt:if>><__trans phrase="On a schedule"></option>
+                    <option value="5"<mt:if name="map_build_type_5"> selected="selected"</mt:if>><__trans phrase="On a schedule"></option>
                     <mt:ignore>
                         <!-- This code needs to be shown if the "On a schedule" has been selected -->
@@ -49,7 +46,6 @@
                     </mt:ignore>
         </mt:ignore>
-                </mt:if>
-                    <option value="2"<mt:if name="build_type_2"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
-                    <option value="0"<mt:if name="build_type_0"> selected="selected"</mt:if>><__trans phrase="Disabled"></option>
+    </mt:if>
+                    <option value="2"<mt:if name="map_build_type_2"> selected="selected"</mt:if><mt:if name="map_build_type_0"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
                 </select>
             </td>