[MRM-905] submitted by Fabrice Daugan -replace EL exepressions containing "empty(" with "empty (", and "not(" with "not (" as EL expression requires