Fixup last to not break share URL