Fixes filters when non are defined ; keeping up to date with changes on getFields