added <> '' constraint in the determination of the fieldmap