Added filter extension and null handling