added querystring to extra-page links
Merge