Fix aggregation function modifying the Settings
Fix aggregation function modifying the Settings

Also revert the Object.entries as it not useful

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet