Event Tracking

FIXED:
- JS-file includes

CHANGED:
- Event tracker conditions