Change filters to use array