fix for server listings, change each to map