Fixed filter for choices (values) to match only the question they were picked for.