Bug 3118

Updates to disposition mapper to correct oddities in disposition text shown to user