diff --git a/src/pfwbged/collection/pfwbcollection.js b/src/pfwbged/collection/pfwbcollection.js
index bb42b39..172d64e 100644
--- a/src/pfwbged/collection/pfwbcollection.js
+++ b/src/pfwbged/collection/pfwbcollection.js
@@ -32,17 +32,27 @@
           criteria_div.find('select.queryindex').prop('disabled', true);
           criteria_div.find('.multipleSelectionWidget dt').removeClass('hiddenStructure');
           criteria_div.find('.multipleSelectionWidget dd').addClass('widgetPulldownMenu').addClass('hiddenStructure');
+          var val = $(criteria_div).find('.queryvalue').val();
+
           if (index == 'thesaurus_keywords') {
-             var val = $(criteria_div).find('.queryvalue').val();
              widget = $.querywidget.createWidget('StringWidget',
                      'thesaurus_keywords', 'form.widgets.query');
              $(widget).find('.queryvalue').val(val);
              $(widget).find('.querylabel').val(val);
              criteria_div.find('.queryvalue').replaceWith(widget);
           }
-          if (index == 'SearchableText') {
+          if (index == 'Title') {
+             $('input[name="text-criteria-title"]').val(val);
              $(criteria_div).hide();
           }
+          if (index == 'SearchableText') {
+             $('input[name="text-criteria-fulltext"]').val(val);
+             $(criteria_div).hide();
+          }
+          if (val && (index == 'Title' || index == 'SearchableText')) {
+             $('fieldset.text-fieldset div.criteria-content').show();
+             $('fieldset.text-fieldset legend').addClass('expanded');
+          }
         });
 
         items.each(function () {
@@ -296,12 +306,6 @@ function select_metatype(elem)
   $('.portaltype-pfwbgedcollection .QueryWidget').data('fieldname', 'form.widgets.query');
 
   /* sync with saved value */
-  $('input[name="text-criteria-fulltext"]').val(
-          $('input[type="hidden"][name="form.widgets.query.i:records"][value="SearchableText"]').parent().next().next().val());
-  if ($('input[name="text-criteria-fulltext"]').val()) {
-     $('fieldset.text-fieldset div.criteria-content').show();
-     $('fieldset.text-fieldset legend').addClass('expanded');
-  }
   //$('input[type="hidden"][name="form.widgets.query.i:records"][value="portal_type"]').parent().parent().find(':checked').each();
   $('input[type="hidden"][name="form.widgets.query.i:records"]').each(function() {
      if ($(this).val() == 'portal_type') {