Fix inconsistencies in filter definitions
* Move id always directly before Name * Use same Description for "VS-NfD Compliant" filter