Moving to two separate drives in autosearch, one for hierarchy, one for non-hierarchy
Reverting to old drive code for accuracy