Add tracking js back and fix bug