Tweaks and fixes for Credly Settings and default handling
Tweak formatting of return