Changed UserQueryHandler to UserContextQueryHandler