Filtering now accounts for buttons not defined yet + choices with "any"