Changed implementation of eventToTerm map to LinkedHashMap to provide consistent ordering of terms