convert more {} to {d} and {s}