Fix colons in keys