UI-685: Clean up popup charges generation