Node list filtering

Change-Id: I5561c66984f368e19813c765d59029faeb12610f
Merge "Node list filtering"