Bug 49208: Make sure the edit link chooses the correct section

Change-Id: I6a9eb693c580f06e1ff3b4d228a9338bfb50f7e2
Merge "Bug 49208: Make sure the edit link chooses the correct section"