Patch more for Thai layout