Add N:* to select language, fix some old code