Fix so that chosen separator is used only after first key segment