Restructure Pinyin code and expose as filter