Fix helper to not crash on null string
Clean up modal create
Clean up modal for adding callback