Add cart quantity exception, remove old handler