refactor output tags and added support for changing base url
Refactor for early returns and avoid assignment in condition
Merge branch 'jdalsem-#6063-refactor-output-tags'