ONC improvements for 'users' view (OMS-317)