Fix values containing '=' and duplicate keys