UC-54 Suggested updates for current pull request

Putting supported tags up at the top rather than buried within a function.