Small changes for filtering