Changed how Filter-Options are iterated through