Removed empty fields check