fix s:subseparator for expanded component
improve s:expand()