Update to remove node filter