Routing Bugs

**Ready to merge**

Fixes #175 as well as the bug where clicking a marketplace causes a crash.