Fixed multi-axis (NER) matching.
Also added frequency-based scores