Fixed issue with share link URL generation
Removed some out of date todos