Fix a number of issues with the market information.
Fix advanced market navigation being broken
Merge pull request #469 from Smashman/dev

Fix a number of issues with the market information.