filters was improved
forgotten enums improved