Fixed Market not loading from Planet
Merge bug fixes