Improvements to deep link URL structure

These changes will break some existing deeplinks, but are necessary for more reliable deeplinking in the future.