Consider the following. We should look first into the manual UI override option:

Rather that make the algorithm smarter, could you provide an override in the UI? Maybe the user could right-click on the table to force it to be included in the query. Would this be easier?