fix to be how we always search for un-disabled things, RT#32230