Fix webstore selector template. Enhance short cart block