filter fields fixes