filter_fields fixes simplified