anchor.diff:                      </tr>
                     </thead>
                     <tbody>
  -                    <c:forEach items="${ step.preferences }" var="parameter">
  -                        <c:set var="paramPath" value="portletPreferences['${ parameter.name }'].value"/>
  -                        <c:set var="overrideParamPath" value="portletPreferenceReadOnly['${ parameter.name }'].value"/>
  +                    <c:forEach items="${ step.preferences }" var="preference">
  +                        <c:set var="paramPath" value="portletPreferences['${ preference.name }'].value"/>
  +                        <c:set var="overrideParamPath" value="portletPreferenceReadOnly['${ preference.name }'].value"/>
                           <c:choose>
  -                          <c:when test="${ parameter.preferenceInput.value.display == 'HIDDEN' }">
  -                            <c:set var="values" value="${ portlet.portletPreferences[parameter.name].value }"/>
  +                          <c:when test="${ preference.preferenceInput.value.display == 'HIDDEN' }">
  +                            <c:set var="values" value="${ portlet.portletPreferences[preference.name].value }"/>
                               <input type="hidden" name="${ fn:escapeXml(paramPath )}" value="${ fn:escapeXml(fn:length(values) > 0 ? values[0] : '' )}"/>
                             </c:when>
                             <c:otherwise>
                               <tr>
  -                              <td class="preference-name"><span class="uportal-label"><spring:message code="${ parameter.label }" text="${ parameter.label }"/>:</span></td>
  +                              <td class="preference-name"><span class="uportal-label"><spring:message code="${ preference.label }" text="${ preference.label }"/>:</span></td>
                                 <td>
  -                                    <editPortlet:preferenceInput input="${ parameter.preferenceInput.value }" 
  -                                      path="${ paramPath }" name="${ parameter.name }" 
  -                                      values="${ portlet.portletPreferences[parameter.name].value }"/>
  +                                    <editPortlet:preferenceInput input="${ preference.preferenceInput.value }" 
  +                                      path="${ paramPath }" name="${ preference.name }" 
  +                                      values="${ portlet.portletPreferences[preference.name].value }"/>
                                 </td>
                                 <td>
                                 <form:checkbox path="${overrideParamPath}" value="true"/>
  
positive.code:                   $("div.preference-options-section").each(function(){
                        up.ParameterEditor(this, {
                              parameterBindName: 'portletPreferences',
                              auxiliaryBindName: 'portletPreferencesOverrides',
                              useAuxiliaryCheckbox: true,
                              dialog: $("#${n}addParameterDialog-" + $(this).attr("dialog")),
                              multivalued: true,
                              messages: {
                                remove: '<spring:message code="remove"/>',
  
negative.code:     </div>
      
      </form:form> <!-- End Form -->
             <div style="display:none"> 
                 <div id="${n}addParameterDialog" class="parameter-adding-dialog jqueryui" title="<spring:message code="add.preference"/>">
                      <div>
                          <form id="${n}addParameterForm" action="javascript:;">
                              <p><spring:message code="preference.name"/>: <input name="name"/></p>
                              <input type="submit" value="<spring:message code="add"/>"/>
                          </form>
                      </div>
                  </div>
             </div>
    </div> <!-- end: portlet-content -->
    
  </div> <!-- end: portlet -->
  <script src="media/skins/universality/common/javascript/uportal/up-parameter-editor.js" language="JavaScript" type="text/javascript"></script>
  <script type="text/javascript">
  	up.jQuery(function() {
  			var $ = up.jQuery;
  