Fix filtering in dynamic choice parameters