Added GA analytics helper and made matching stricter