UserService queries edited