Revert removing "-" or "_" when getting product name and add more brands
Add white list button and fix issue of cpu hareware is missing