#28 - Properly used Filter for list instead of re-creating.