Break up query to avoid join.   We'll see if this reduces the number of query timeouts for this feature.