Improve piwik tracking