Hide/exclude from search sub-objects for disabled datasources

At the moment when a datasource is disabled, the DS object can still have sub-objects in the resource tree (under the disabled section).  These sub-objects still show up in the resource tree search results.  This is very confusing for our users as they expect not to find them (and nor do we want them to see them).  Please make it so that sub-objects of disabled datasources are excluded from resource tree searches.  (Ideally I would suggest making this a toggle option in Settings in case some folks want the opposite behavior.)