Fixed new algorithm for abbreviation mapping not actually being used