Updated bookmarklet and user routing