Fleshed out filter node more