Corrections for EFDB_V6 to match needed categories.
Merge remote-tracking branch 'origin/master'