Made checking for installed sets more rubust & retab