Links tables fix for subpage issue

Change-Id: I8c0ec0ab9c2dc1e56c9c6d30e4b773a9f52bf653