add '_' and '.' to topic match group