replace . with space, dept name mappings, correct sorting with postfixes
merge fix