Data fields

Fixes for data fields in google analytics