some fixes in cart & catalog