Fix filtering for drop-downs