Add table query for user listing

Add table query for user listing
Conflict

conflict fix