Fixed the filtering