Server settings duplicating search folders

When forcing server settings to update for my clients, if there are Search Folders in the settings, they are duplicating on the clients. For example, if there was a Search Folder called “From Bob” then there will be a “From Bob 2” Search Folder after update.

This should work like Tags; only updating folders that require it and adding only new folders.