US23011: Better coverage for Tags; other minor fixes