Improve language field check