Analytics Changes

Improved customer segmentation on etc, remote, kiosk