Better handling of unique value filters