Remove software model/model group from search by component to better performance