Fixed NPE
Reverted to simple filtering