Merge "Avoid multiple test for same lvl in auto filter lvl pick"