Moved to actual tracking instead of views

And more coverage for analytics
3.5.19
Merge pull request #816 from remy/fix/analytics-tracking

Fix/analytics tracking