Fixed enum filtering