UC-54 Suggested updates for current pull request

Got rid of this function and just made an array.  Making FB calls for every defined tag just to see if it returns empty seems wasteful an unnecessary.