added fixes for google analytics