Added a query to the user repository and used it to provide a nicer pair of notifications in the collection service