Move check for currentlySelected out of NAC#deselectCurrentlySelected and NAC#populateCurrentlySelected