improve retailer + fix rest cms service