Fixed some issues with adding and removing agents from charging list