FIxed issue with filtering.