DEVSUPPORT-990: Fix harvesting issues with blank fields