Added donttrackus tokens, some problem with html still