Users listing
Fix some user queries for user listing