moving nodes count to settings instead of being hardcoded

Change-Id: I0ff0b741a2ff8a895541a20df9bdf1b49d5157c0
Merge "moving nodes count to settings instead of being hardcoded"