Handle URLEncoded internal page links properly

Change-Id: I5b687e11c503df447e9e726a5858a816f1997259