Backport #34743 by wxiaoguang Regression of recent dropdown filter change. Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>