fix 'no container' and fieldset renaming issues