Improved link handling and workspace ID