diff --git a/traffic_ops/app/lib/UI/Topology.pm b/traffic_ops/app/lib/UI/Topology.pm
index d6ba02242..7dbdc2cbf 100644
--- a/traffic_ops/app/lib/UI/Topology.pm
+++ b/traffic_ops/app/lib/UI/Topology.pm
@@ -106,9 +106,8 @@ sub gen_crconfig_json {
 
 	my %cache_tracker;
 	my $rs_caches = $self->db->resultset('Server')->search(
-		{ 'profile' => { -in => [ @{$profile_cache->{'EDGE'}}, @{$profile_cache->{'MID'}}, @{$profile_cache->{'CCR'}}, @{$profile_cache->{'RASCAL'}} ] } },
-		{
-			prefetch => [ 'type', 'status', 'cachegroup', 'profile' ],
+		{ 	'type.name' => { -in => [ 'EDGE', 'MID', 'CCR', 'RASCAL', 'TR', 'TM' ] }, 'cdn_id' => $cdn_id  },
+		{ 	prefetch => [ 'type', 'status', 'cachegroup', 'profile' ],
 			columns  => [ 'host_name', 'domain_name', 'tcp_port',   'interface_name', 'ip_address', 'ip6_address', 'id', 'xmpp_id' ]
 		}
 	);