Now using filter.
Fixed the filtering stuff.