Revert "Revert "Unexpected Tags""

This reverts commit 348ee5c0a7a3925a10f15a8c3d6d781fc666aacb.