Improve Or group computation performances by reducing DNF
Fix export to FAMA