Rework the block that fetches the direct-linked annotation's group and
adds it to the featured groups list so that there is only one return
point at the end.