Bugs V or VI

* Record the most recently used marketplace
* Fix issue with wrong type of marketplace object being loaded.