2870 User story, cookie store tech need fix