Better tracking through javascript