minor repairs to data type maps
attempt to use map as a switch, some fields are typed (FILE BLOB)