Fixed linked routing for demo