[#30679] Fix two Tags-related API issues. Thanks Elin Waring.