Improve listMarketCatalogueAll and listMarketBookAll