mod/hotpot fix sorting of sub/superscript chars in keypad
Pull upstream