Fixing configfile save with multiple entries
Merge