Added even better handling for blank fields