Tagged discovery-management