Filter simplified.
Fixed the filtering.
Output fix.