Handle more empty fields