Use pathname for entry request
Merge branch 'master' into gh-pages