date and enum filtering working properly
fix mixed files