Formatting cleanup, changed to use new ResourceFacade.evaluateStringExpand() method with the additionalContext Map