Further tweaks based on review feedback and make URLs truly bookmarkable