add keys and filter enums