Hub link fixes demo

@angiedev, thought I'd put my proposed changes out in a PR for you to better see the code all in one place. :anchor:  Again, no hurry :hamster: