Bug #825293 reorganized number of nodes & currentDisplayed comparision