cleanup map field processing - especially date handling in rule builder