Simple fix to avoid performance problems for subdomains with lots of labels