VE-652: fix tracking

https://wikia-inc.atlassian.net/browse/VE-652

This pull request eliminates regressions in our VE tracking code.