fixing cart selection
Merge branch 'master' into production