Finally got the filtering working on new items