Fixed formatting and external ref to analytics