Improve and fix some problems in the marketplace history navigation