Fix handling for old-style deeplinks