diff --git a/+dj/ERD.m b/+dj/ERD.m
index 669894a0..c2ec30b3 100644
--- a/+dj/ERD.m
+++ b/+dj/ERD.m
@@ -113,12 +113,12 @@ function draw(self)
             % draw the diagram
             
             % exclude auxiliary tables (job tables, etc.)
-            j = cellfun(@isempty, regexp(self.nodes, '^`[a-z]\w*`\.`~\w+`$'));
+            j = cellfun(@isempty, regexp(self.nodes, '^`.+`\.`~\w+`$'));
             self.nodes = self.nodes(j);
             
             self.makeGraph
             
-            rege = cellfun(@(s) sprintf('^`[a-z]\\w*`\\.`%s[a-z]\\w*`$',s), dj.Schema.tierPrefixes, 'uni', false);
+            rege = cellfun(@(s) sprintf('^`.+`\\.`%s[a-z]\\w*`$',s), dj.Schema.tierPrefixes, 'uni', false);
             rege{end+1} = '^`[a-z]\w*`\.`\W?\w+__\w+`$';   % for part tables
             rege{end+1} = '^\d+$';  % for numbered nodes
             tiers = cellfun(@(l) find(~cellfun(@isempty, regexp(l, rege)), 1, 'last'), self.graph.Nodes.Name);