Show correct target for adapted links

Change-Id: Iaa8fb9ab3b25ee0c4e8d50041f190f8132387273
Merge "Show correct target for adapted links"