Language selection improved