YH-228: Improved user listing