Adjust character encoding scheme to better account for Bubela