Andrew/Pooja: fixing js error on all the pages