Fix for blank hierarchicalGeographic fields and multiple date fields