Improve listing of users and nodes