reference both the Trac tickets
adjust check of group IDs across annotation links