fix inventory vs. hardware type selection, RT#33425