Some simplification - use server.name, simplify type filtering