Made the filtering better