Test and fix unicode-support in key-related functions that didn't concatenate strings unicode-awarely