From 42332853ca9ddbfe52ffd7fc711bfe8ebbd91d61 Mon Sep 17 00:00:00 2001
From: Seungpyo1007 <rush94434@gmail.com>
Date: Sun, 27 Sep 2026 06:01:06 +0900
Subject: [PATCH] fix(data): correct tablet storage and battery, laptop storage
 and monitor size/resolution from each record's own text

- tablet/watch storage_options_gb re-parsed from memory_internal where the
  import mixed the RAM size into the storage list (259 records)
- iPad Pro 12.9 (2015, 2017) battery_mah restored from the raw battery text
- 3 laptops: storage_gb taken from the configuration in the model name
- monitors: size_inch and resolution taken from the listing name (5), and
  aspect_ratio nulled where it contradicts the pixel resolution (24)

Refs #296
---
 .../asus-f756ux-t4201d-i7-7500u-8gb-128gb-ammok-243.json      | 2 +-
 .../asus-k756ux-t4340t-i5-7200u-8gb-500gb-ammok-229.json      | 2 +-
 .../asus-ux510ux-cn269t-i7-7500u-8gb-256gb-ammok-333.json     | 2 +-
 .../2023/acer-eda343cur/acer-eda343cur-amazonmon-177.json     | 2 +-
 .../asus/2023/asus-ve278h/asus-ve278h-amazonmon-844.json      | 2 +-
 .../asus/2023/asus-vg328h1b/asus-vg328h1b-amazonmon-653.json  | 2 +-
 .../dell-dell-inspiron-touchscreen-amazonmon-206.json         | 2 +-
 .../dell/2023/dell-p3421w/dell-p3421w-amazonmon-384.json      | 2 +-
 .../dell/2023/dell-s2240m/dell-s2240m-amazonmon-802.json      | 2 +-
 .../2023/gigabyte-gs34wqc/gigabyte-gs34wqc-amazonmon-779.json | 2 +-
 .../2023/innocn-hdr400/innocn-hdr400-amazonmon-218.json       | 2 +-
 .../innoview-innoview-portable-screen-amazonmon-669.json      | 2 +-
 .../lenovo-lenovo-thinkvision-full-amazonmon-465.json         | 2 +-
 .../2023/lenovo-p24h-30/lenovo-p24h-30-amazonmon-434.json     | 2 +-
 .../lg/2023/lg-34bq77qb/lg-34bq77qb-amazonmon-637.json        | 2 +-
 data/monitor/lg/2023/lg-34gp63a/lg-34gp63a-amazonmon-109.json | 2 +-
 data/monitor/lg/2023/lg-34wl500/lg-34wl500-amazonmon-578.json | 2 +-
 data/monitor/lg/2023/lg-38bq88c/lg-38bq88c-amazonmon-648.json | 4 ++--
 .../lg-lg-digital-signage-amazonmon-444.json                  | 2 +-
 .../lg-lg-ultragear-gaming-amazonmon-46.json                  | 2 +-
 .../lg-lg-ultragear-gaming-amazonmon-466.json                 | 2 +-
 .../lilliput-fa1014-np/lilliput-fa1014-np-amazonmon-767.json  | 4 ++--
 .../2023/lilliput-ip65/lilliput-ip65-amazonmon-612.json       | 2 +-
 .../msi/2023/msi-mag274upf/msi-mag274upf-amazonmon-108.json   | 2 +-
 .../msi/2023/msi-mp341cqw/msi-mp341cqw-amazonmon-377.json     | 2 +-
 .../samsung/2023/samsung-g93sc/samsung-g93sc-amazonmon-9.json | 2 +-
 .../samsung-samsung-business-curved-amazonmon-59.json         | 2 +-
 .../samsung-samsung-odyssey-series-amazonmon-41.json          | 2 +-
 .../samsung-samsung-viewfinity-series-amazonmon-383.json      | 2 +-
 .../viewsonic-vg2239smh-amazonmon-573.json                    | 2 +-
 .../iconia-tab-a100/acer-iconia-tab-a100-scrapegsma-1774.json | 2 +-
 .../iconia-tab-a101/acer-iconia-tab-a101-scrapegsma-1773.json | 2 +-
 .../iconia-tab-a500/acer-iconia-tab-a500-scrapegsma-1772.json | 2 +-
 .../iconia-tab-a501/acer-iconia-tab-a501-scrapegsma-1770.json | 3 ++-
 .../iconia-tab-a110/acer-iconia-tab-a110-scrapegsma-1756.json | 1 -
 .../iconia-tab-a200/acer-iconia-tab-a200-scrapegsma-1763.json | 2 +-
 .../iconia-tab-a210/acer-iconia-tab-a210-scrapegsma-1762.json | 2 +-
 .../iconia-tab-a510/acer-iconia-tab-a510-scrapegsma-1767.json | 2 +-
 .../iconia-tab-a511/acer-iconia-tab-a511-scrapegsma-1766.json | 2 +-
 .../iconia-tab-a700/acer-iconia-tab-a700-scrapegsma-1765.json | 3 ++-
 .../iconia-tab-a701/acer-iconia-tab-a701-scrapegsma-1764.json | 3 ++-
 .../acer-iconia-tab-a1-810-scrapegsma-1749.json               | 2 +-
 .../acer-iconia-tab-a1-811-scrapegsma-1748.json               | 1 -
 .../iconia-tab-a3/acer-iconia-tab-a3-scrapegsma-1747.json     | 2 +-
 .../acer-iconia-tab-b1-710-scrapegsma-1754.json               | 1 -
 .../acer-iconia-tab-b1-a71-scrapegsma-1755.json               | 1 +
 .../acer-iconia-tab-7-a1-713-scrapegsma-1734.json             | 1 -
 .../acer-iconia-tab-7-a1-713hd-scrapegsma-1735.json           | 1 -
 .../acer-iconia-tab-8-a1-840fhd-scrapegsma-1733.json          | 2 +-
 .../acer-iconia-tab-10-a3-a30-scrapegsma-1719.json            | 3 ++-
 .../acer-chromebook-tab-10-scrapegsma-1700.json               | 1 -
 .../alcatel-one-touch-tab-7-hd-scrapegsma-1691.json           | 1 -
 .../alcatel-one-touch-tab-7-scrapegsma-1690.json              | 1 -
 .../amazon-fire-hd-10-2017-scrapegsma-2291.json               | 2 +-
 .../fire-hd-8-2017/amazon-fire-hd-8-2017-scrapegsma-2292.json | 2 +-
 .../ipad-wi-fi-3g/apple-ipad-wi-fi-3g-scrapegsma-2406.json    | 2 ++
 .../2010/ipad-wi-fi/apple-ipad-wi-fi-scrapegsma-2407.json     | 2 ++
 .../2011/ipad-2-cdma/apple-ipad-2-cdma-scrapegsma-2403.json   | 2 ++
 .../apple-ipad-2-wi-fi-3g-scrapegsma-2401.json                | 2 ++
 .../2011/ipad-2-wi-fi/apple-ipad-2-wi-fi-scrapegsma-2402.json | 2 ++
 .../apple-ipad-3-wi-fi-cellular-scrapegsma-2398.json          | 3 ++-
 .../2012/ipad-3-wi-fi/apple-ipad-3-wi-fi-scrapegsma-2399.json | 3 ++-
 .../apple-ipad-4-wi-fi-cellular-scrapegsma-2396.json          | 4 +++-
 .../2012/ipad-4-wi-fi/apple-ipad-4-wi-fi-scrapegsma-2395.json | 4 +++-
 .../apple-ipad-mini-wi-fi-cellular-scrapegsma-2394.json       | 2 ++
 .../apple-ipad-mini-wi-fi-scrapegsma-2393.json                | 2 ++
 .../apple/2013/ipad-air/apple-ipad-air-scrapegsma-2389.json   | 4 +++-
 .../2013/ipad-mini-2/apple-ipad-mini-2-scrapegsma-2390.json   | 4 +++-
 .../2014/ipad-air-2/apple-ipad-air-2-scrapegsma-2385.json     | 4 +++-
 .../2014/ipad-mini-3/apple-ipad-mini-3-scrapegsma-2386.json   | 3 ++-
 .../2015/ipad-mini-4/apple-ipad-mini-4-scrapegsma-2378.json   | 4 +++-
 .../apple-ipad-pro-12-9-2015-4gb-256gb-4g-lte.json            | 2 +-
 .../apple-ipad-pro-12-9-2015-scrapegsma-2377.json             | 3 ++-
 .../apple-ipad-pro-9-7-2016-scrapegsma-2373.json              | 3 ++-
 .../ipad-9-7-2017/apple-ipad-9-7-2017-scrapegsma-2362.json    | 2 +-
 .../apple-ipad-pro-10-5-2017-scrapegsma-2361.json             | 3 ++-
 .../apple-ipad-pro-12-9-2017-4gb-512gb-4g-lte.json            | 2 +-
 .../apple-ipad-pro-12-9-2017-scrapegsma-2360.json             | 3 ++-
 .../ipad-mini-2019/apple-ipad-mini-2019-scrapegsma-2345.json  | 2 +-
 .../2017/diamond-tab/archos-diamond-tab-scrapegsma-2418.json  | 1 -
 .../asus-google-nexus-7-cellular-scrapegsma-2588.json         | 2 +-
 .../google-nexus-7/asus-google-nexus-7-scrapegsma-2591.json   | 3 ++-
 .../asus/2012/padfone-2/asus-padfone-2-scrapegsma-2590.json   | 3 ++-
 .../asus/2012/padfone/asus-padfone-scrapegsma-2600.json       | 3 ++-
 .../asus-google-nexus-7-2013-scrapegsma-2578.json             | 2 +-
 .../2013/memo-pad-10/asus-memo-pad-10-scrapegsma-2575.json    | 2 +-
 .../asus-memo-pad-8-me180a-scrapegsma-2576.json               | 1 -
 .../memo-pad-fhd10/asus-memo-pad-fhd10-scrapegsma-2581.json   | 2 +-
 .../memo-pad-me172v/asus-memo-pad-me172v-scrapegsma-2587.json | 2 +-
 .../asus-padfone-infinity-2-scrapegsma-2574.json              | 2 +-
 .../asus-padfone-infinity-scrapegsma-2585.json                | 2 +-
 .../2013/padfone-mini/asus-padfone-mini-scrapegsma-2572.json  | 1 -
 .../asus-memo-pad-10-me103k-scrapegsma-2546.json              | 3 ++-
 .../asus-memo-pad-7-me176c-scrapegsma-2554.json               | 2 +-
 .../asus-memo-pad-7-me572c-scrapegsma-2549.json               | 2 +-
 .../asus-memo-pad-7-me572cl-scrapegsma-2548.json              | 2 +-
 .../asus-memo-pad-8-me181c-scrapegsma-2553.json               | 1 -
 .../asus-memo-pad-8-me581cl-scrapegsma-2552.json              | 2 +-
 .../asus-padfone-infinity-lite-scrapegsma-2563.json           | 2 +-
 .../asus-padfone-mini-4g-intel-scrapegsma-2570.json           | 1 -
 .../asus-padfone-mini-intel-scrapegsma-2571.json              | 1 -
 .../asus/2014/padfone-s/asus-padfone-s-scrapegsma-2562.json   | 1 -
 .../padfone-x-mini/asus-padfone-x-mini-scrapegsma-2547.json   | 1 -
 .../asus/2014/padfone-x/asus-padfone-x-scrapegsma-2561.json   | 1 -
 .../asus-transformer-pad-tf103c-scrapegsma-2559.json          | 2 +-
 .../asus-transformer-pad-tf303cl-scrapegsma-2558.json         | 2 +-
 .../blackberry-playbook-wimax-scrapegsma-2785.json            | 3 ++-
 .../2010/playbook/blackberry-playbook-scrapegsma-2786.json    | 3 ++-
 .../blackberry-4g-playbook-hspa-scrapegsma-2784.json          | 3 ++-
 .../2014/life-view-tab/blu-life-view-tab-scrapegsma-3024.json | 1 -
 data/tablet/honor/2016/pad-2/honor-pad-2-scrapegsma-3759.json | 2 +-
 .../hp/2011/touchpad-4g/hp-touchpad-4g-scrapegsma-3802.json   | 1 -
 data/tablet/hp/2011/touchpad/hp-touchpad-scrapegsma-3807.json | 2 +-
 .../hp-pro-slate-10-ee-g1-scrapegsma-3788.json                | 2 +-
 .../hp/2015/pro-slate-8/hp-pro-slate-8-scrapegsma-3789.json   | 2 +-
 .../huawei-mediapad-s7-301w-scrapegsma-4288.json              | 1 -
 .../huawei/2011/mediapad/huawei-mediapad-scrapegsma-4287.json | 1 -
 .../huawei-mediapad-10-fhd-scrapegsma-4278.json               | 4 +++-
 .../huawei-mediapad-7-lite-scrapegsma-4262.json               | 1 -
 .../huawei-mediapad-10-link-scrapegsma-4255.json              | 3 ++-
 .../huawei-mediapad-7-vogue-scrapegsma-4239.json              | 1 -
 .../huawei-mediapad-7-youth-scrapegsma-1002.json              | 1 -
 .../huawei-mediapad-7-youth-scrapegsma-119.json               | 1 -
 .../huawei-mediapad-10-link-scrapegsma-4219.json              | 2 +-
 .../huawei-mediapad-7-youth2-scrapegsma-4225.json             | 2 +-
 .../2014/mediapad-m1/huawei-mediapad-m1-scrapegsma-4222.json  | 1 -
 .../huawei-mediapad-t1-8-0-scrapegsma-4204.json               | 2 +-
 .../2014/mediapad-x1/huawei-mediapad-x1-scrapegsma-4223.json  | 1 -
 .../mediapad-t1-10/huawei-mediapad-t1-10-scrapegsma-4203.json | 1 -
 .../huawei-mediapad-m2-7-0-scrapegsma-4170.json               | 2 +-
 .../huawei-mediapad-m3-8-4-scrapegsma-4162.json               | 2 +-
 .../huawei-mediapad-t1-7-0-plus-scrapegsma-4169.json          | 1 -
 .../huawei-mediapad-t2-10-0-pro-scrapegsma-4165.json          | 2 --
 .../huawei-mediapad-t2-7-0-scrapegsma-4167.json               | 2 --
 .../huawei-mediapad-m3-lite-10-scrapegsma-4140.json           | 4 +---
 .../huawei-mediapad-m3-lite-8-scrapegsma-4138.json            | 4 +---
 .../huawei-mediapad-m5-10-pro-scrapegsma-4126.json            | 2 +-
 .../mediapad-m5-10/huawei-mediapad-m5-10-scrapegsma-4127.json | 3 ++-
 .../mediapad-m5-8/huawei-mediapad-m5-8-scrapegsma-4128.json   | 3 ++-
 .../huawei-mediapad-m6-turbo-8-4-scrapegsma-108.json          | 1 -
 .../huawei-mediapad-m6-turbo-8-4-scrapegsma-991.json          | 1 -
 .../jolla/2014/tablet/jolla-tablet-scrapegsma-4526.json       | 2 +-
 .../yoga-tablet-10/lenovo-yoga-tablet-10-scrapegsma-4866.json | 2 +-
 .../yoga-tablet-8/lenovo-yoga-tablet-8-scrapegsma-4867.json   | 2 +-
 .../lenovo/2014/tab-s8/lenovo-tab-s8-scrapegsma-4838.json     | 1 -
 .../lenovo-yoga-tablet-10-hd-scrapegsma-4857.json             | 2 +-
 .../lenovo-yoga-tablet-2-10-1-scrapegsma-4836.json            | 1 -
 .../lenovo-yoga-tablet-2-8-0-scrapegsma-4837.json             | 1 -
 .../lenovo-yoga-tablet-2-pro-scrapegsma-4835.json             | 1 -
 .../tab-2-a10-70/lenovo-tab-2-a10-70-scrapegsma-4818.json     | 1 -
 .../2015/tab-2-a7-10/lenovo-tab-2-a7-10-scrapegsma-4823.json  | 2 +-
 .../2015/tab-2-a7-20/lenovo-tab-2-a7-20-scrapegsma-4822.json  | 2 +-
 .../2015/tab-2-a7-30/lenovo-tab-2-a7-30-scrapegsma-4821.json  | 1 -
 .../2015/tab-2-a8-50/lenovo-tab-2-a8-50-scrapegsma-4819.json  | 2 +-
 .../yoga-tab-3-8-0/lenovo-yoga-tab-3-8-0-scrapegsma-4796.json | 1 -
 .../yoga-tab-3-pro/lenovo-yoga-tab-3-pro-scrapegsma-4795.json | 1 -
 .../yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-1054.json   | 1 -
 .../yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-171.json    | 1 -
 .../lenovo-yoga-tab-3-plus-scrapegsma-4771.json               | 1 -
 .../lenovo/2017/moto-tab/lenovo-moto-tab-scrapegsma-4751.json | 1 -
 .../lenovo/2017/tab-4-10/lenovo-tab-4-10-scrapegsma-4758.json | 2 +-
 .../lenovo/2017/tab-4-8/lenovo-tab-4-8-scrapegsma-4760.json   | 2 +-
 .../lenovo-tab-7-essential-scrapegsma-4752.json               | 1 -
 .../lenovo/2017/tab-7/lenovo-tab-7-scrapegsma-4753.json       | 1 -
 .../lenovo/2019/tab-v7/lenovo-tab-v7-scrapegsma-4736.json     | 1 -
 .../yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-1043.json | 1 -
 .../yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-160.json  | 1 -
 .../lg/2013/g-pad-8-3/lg-g-pad-8-3-scrapegsma-5079.json       | 1 -
 .../g-pad-10-1-lte/lg-g-pad-10-1-lte-scrapegsma-5047.json     | 1 -
 .../lg/2014/g-pad-10-1/lg-g-pad-10-1-scrapegsma-5048.json     | 1 -
 .../2014/g-pad-7-0-lte/lg-g-pad-7-0-lte-scrapegsma-5034.json  | 1 -
 .../lg/2014/g-pad-7-0/lg-g-pad-7-0-scrapegsma-5050.json       | 1 -
 .../2014/g-pad-8-0-lte/lg-g-pad-8-0-lte-scrapegsma-5031.json  | 2 +-
 .../lg/2014/g-pad-8-0/lg-g-pad-8-0-scrapegsma-5049.json       | 1 -
 .../2014/g-pad-8-3-lte/lg-g-pad-8-3-lte-scrapegsma-5055.json  | 1 -
 .../2015/g-pad-ii-10-1/lg-g-pad-ii-10-1-scrapegsma-5000.json  | 1 -
 .../g-pad-ii-8-0-lte/lg-g-pad-ii-8-0-lte-scrapegsma-5001.json | 1 -
 .../g-pad-ii-8-3-lte/lg-g-pad-ii-8-3-lte-scrapegsma-4991.json | 1 -
 .../lg-g-pad-iii-10-1-fhd-scrapegsma-4967.json                | 1 -
 .../lg/2016/g-pad-x-8-0/lg-g-pad-x-8-0-scrapegsma-4975.json   | 2 +-
 .../g-pad-iv-8-0-fhd/lg-g-pad-iv-8-0-fhd-scrapegsma-4952.json | 1 -
 .../lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-1066.json | 1 -
 .../lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-183.json  | 1 -
 .../maxwest-tab-phone-72dc-scrapegsma-5537.json               | 1 -
 .../micromax-canvas-tab-p470-scrapegsma-5709.json             | 1 -
 .../micromax-canvas-tab-p666-scrapegsma-5708.json             | 1 -
 .../samsung-p1000-galaxy-tab-scrapegsma-8403.json             | 1 +
 .../samsung-galaxy-tab-10-1-lte-i905-scrapegsma-8345.json     | 2 +-
 .../samsung-galaxy-tab-10-1-p7510-scrapegsma-8346.json        | 3 ++-
 .../samsung-galaxy-tab-8-9-lte-i957-scrapegsma-8302.json      | 2 +-
 .../samsung-galaxy-tab-8-9-p7300-scrapegsma-8347.json         | 3 ++-
 .../samsung-galaxy-tab-8-9-p7310-scrapegsma-8348.json         | 3 ++-
 .../samsung-p6200-galaxy-tab-7-0-plus-scrapegsma-8286.json    | 2 +-
 .../samsung-p6210-galaxy-tab-7-0-plus-scrapegsma-8285.json    | 2 +-
 .../samsung-p6800-galaxy-tab-7-7-scrapegsma-8291.json         | 3 ++-
 .../samsung-p6810-galaxy-tab-7-7-scrapegsma-8290.json         | 3 ++-
 .../samsung-p7500-galaxy-tab-10-1-3g-scrapegsma-8344.json     | 3 ++-
 .../samsung-ativ-tab-p8510-scrapegsma-8180.json               | 2 +-
 .../samsung-galaxy-tab-2-10-1-cdma-scrapegsma-8234.json       | 2 +-
 .../samsung-galaxy-tab-2-10-1-p5100-scrapegsma-8235.json      | 2 +-
 .../samsung-galaxy-tab-2-10-1-p5110-scrapegsma-8233.json      | 3 ++-
 .../samsung-galaxy-tab-2-7-0-i705-scrapegsma-8200.json        | 1 -
 .../samsung-galaxy-tab-2-7-0-p3100-scrapegsma-8244.json       | 3 ++-
 .../samsung-galaxy-tab-2-7-0-p3110-scrapegsma-8243.json       | 3 ++-
 .../samsung-galaxy-tab-7-7-lte-i815-scrapegsma-8252.json      | 2 +-
 .../samsung-galaxy-tab-8-9-4g-p7320t-scrapegsma-8216.json     | 2 +-
 .../samsung-galaxy-tab-3-10-1-p5200-scrapegsma-8137.json      | 2 +-
 .../samsung-galaxy-tab-3-10-1-p5210-scrapegsma-8138.json      | 2 +-
 .../samsung-galaxy-tab-3-10-1-p5220-scrapegsma-8136.json      | 2 +-
 .../samsung-galaxy-tab-3-7-0-wifi-scrapegsma-8141.json        | 2 +-
 .../samsung-galaxy-tab-3-7-0-scrapegsma-8142.json             | 2 +-
 .../samsung-galaxy-tab-3-8-0-scrapegsma-8135.json             | 2 +-
 .../samsung-galaxy-tab-3-lite-7-0-3g-scrapegsma-8093.json     | 1 -
 .../samsung-galaxy-tab-3-lite-7-0-scrapegsma-8094.json        | 1 -
 .../samsung-galaxy-tab-4-10-1-3g-scrapegsma-8078.json         | 1 -
 .../samsung-galaxy-tab-4-10-1-lte-scrapegsma-8079.json        | 1 -
 .../samsung-galaxy-tab-4-10-1-scrapegsma-8077.json            | 1 -
 .../samsung-galaxy-tab-4-7-0-3g-scrapegsma-8072.json          | 2 +-
 .../samsung-galaxy-tab-4-7-0-lte-scrapegsma-8073.json         | 2 +-
 .../samsung-galaxy-tab-4-7-0-scrapegsma-8071.json             | 2 +-
 .../samsung-galaxy-tab-4-8-0-3g-scrapegsma-8075.json          | 1 -
 .../samsung-galaxy-tab-4-8-0-lte-scrapegsma-8076.json         | 1 -
 .../samsung-galaxy-tab-4-8-0-scrapegsma-8074.json             | 1 -
 .../samsung-galaxy-tab-active-lte-scrapegsma-8030.json        | 1 -
 .../samsung-galaxy-tab-active-scrapegsma-8031.json            | 1 -
 .../samsung-galaxy-tab-pro-10-1-lte-scrapegsma-8102.json      | 2 +-
 .../samsung-galaxy-tab-pro-10-1-scrapegsma-8103.json          | 2 +-
 .../samsung-galaxy-tab-pro-12-2-3g-scrapegsma-8100.json       | 2 +-
 .../samsung-galaxy-tab-pro-12-2-lte-scrapegsma-8099.json      | 2 +-
 .../samsung-galaxy-tab-pro-12-2-scrapegsma-8101.json          | 2 +-
 .../samsung-galaxy-tab-pro-8-4-3g-lte-scrapegsma-8104.json    | 2 +-
 .../samsung-galaxy-tab-pro-8-4-scrapegsma-8105.json           | 2 +-
 .../samsung-galaxy-tab-s-10-5-lte-scrapegsma-8059.json        | 2 +-
 .../samsung-galaxy-tab-s-10-5-scrapegsma-8060.json            | 2 +-
 .../samsung-galaxy-tab-s-8-4-lte-scrapegsma-8057.json         | 2 +-
 .../samsung-galaxy-tab-s-8-4-scrapegsma-8058.json             | 2 +-
 .../samsung-galaxy-tab-3-lite-7-0-ve-scrapegsma-8008.json     | 1 -
 .../samsung-galaxy-tab-3-v-scrapegsma-7993.json               | 1 -
 .../samsung-galaxy-tab-4-10-1-2015-scrapegsma-7987.json       | 1 -
 .../samsung-galaxy-tab-4-8-0-2015-scrapegsma-8047.json        | 1 -
 ...msung-galaxy-tab-a-8-0-and-s-pen-2015-scrapegsma-1512.json | 1 -
 .../samsung-galaxy-tab-a-8-0-and-s-pen-scrapegsma-7996.json   | 1 -
 .../samsung-galaxy-tab-a-9-7-and-s-pen-scrapegsma-7994.json   | 1 -
 .../samsung-galaxy-tab-s2-8-0-scrapegsma-7980.json            | 2 +-
 .../samsung-galaxy-tab-s2-9-7-scrapegsma-7979.json            | 2 +-
 .../samsung-galaxy-tab-a-10-1-2016-scrapegsma-7946.json       | 2 --
 .../samsung-galaxy-tab-a-7-0-2016-scrapegsma-7947.json        | 1 -
 .../samsung-galaxy-tab-e-8-0-scrapegsma-7954.json             | 1 -
 .../galaxy-tab-j/samsung-galaxy-tab-j-scrapegsma-7933.json    | 1 -
 .../samsung-galaxy-tab-a-8-0-2017-scrapegsma-7891.json        | 1 -
 .../samsung-galaxy-tab-active-2-scrapegsma-7890.json          | 1 -
 .../samsung-galaxy-tab-s3-9-7-scrapegsma-7909.json            | 1 -
 .../samsung-galaxy-tab-a-10-5-scrapegsma-7861.json            | 1 -
 .../samsung-galaxy-tab-a-8-0-2018-scrapegsma-7859.json        | 1 -
 .../samsung-galaxy-tab-advanced2-scrapegsma-7858.json         | 1 -
 .../samsung-galaxy-tab-s4-10-5-scrapegsma-7860.json           | 3 +--
 .../samsung-galaxy-tab-a-10-1-2019-scrapegsma-7856.json       | 1 -
 .../samsung-galaxy-tab-a-8-0-2019-scrapegsma-1506.json        | 1 -
 ...msung-galaxy-tab-a-8-0-and-s-pen-2019-scrapegsma-1510.json | 1 -
 .../samsung-galaxy-tab-a-8-2019-scrapegsma-7857.json          | 1 -
 .../samsung-galaxy-tab-active-pro-scrapegsma-1493.json        | 1 -
 .../samsung-galaxy-tab-s6-5g-scrapegsma-1480.json             | 1 -
 .../2011/tablet-p-3g/sony-tablet-p-3g-scrapegsma-9247.json    | 1 -
 .../sony/2012/tablet-p/sony-tablet-p-scrapegsma-9246.json     | 1 -
 .../sony-xperia-tablet-s-3g-scrapegsma-9223.json              | 3 ++-
 .../xperia-tablet-s/sony-xperia-tablet-s-scrapegsma-9224.json | 3 ++-
 .../sony-xperia-tablet-z-lte-scrapegsma-9216.json             | 1 -
 .../sony-xperia-tablet-z-wi-fi-scrapegsma-9217.json           | 2 +-
 .../sony-xperia-z2-tablet-lte-scrapegsma-9200.json            | 1 -
 .../sony-xperia-z2-tablet-wi-fi-scrapegsma-9201.json          | 2 +-
 .../sony-xperia-z3-tablet-compact-scrapegsma-9186.json        | 1 -
 .../sony-xperia-z4-tablet-lte-scrapegsma-9179.json            | 1 -
 .../sony-xperia-z4-tablet-wifi-scrapegsma-9178.json           | 1 -
 .../vodafone-smart-tab-ii-10-scrapegsma-10034.json            | 1 -
 .../vodafone-smart-tab-ii-7-scrapegsma-10035.json             | 1 -
 .../smart-tab-4g/vodafone-smart-tab-4g-scrapegsma-10023.json  | 1 -
 .../tab-prime-6/vodafone-tab-prime-6-scrapegsma-10019.json    | 1 -
 .../tab-prime-7/vodafone-tab-prime-7-scrapegsma-10011.json    | 1 -
 .../smart-tab-n8/vodafone-smart-tab-n8-scrapegsma-10007.json  | 1 -
 .../2014/mi-pad-7-9/xiaomi-mi-pad-7-9-scrapegsma-10235.json   | 2 +-
 .../2015/mi-pad-2/xiaomi-mi-pad-2-scrapegsma-10221.json       | 2 +-
 .../2017/mi-pad-3/xiaomi-mi-pad-3-scrapegsma-10197.json       | 1 -
 .../2013/play-tab-7-0/xolo-play-tab-7-0-scrapegsma-10315.json | 1 -
 data/tablet/xolo/2013/tab/xolo-tab-scrapegsma-10316.json      | 1 -
 .../light-tab-3-v9s/zte-light-tab-3-v9s-scrapegsma-10612.json | 1 -
 .../apple-watch-series-3-aluminum-scrapegsma-2359.json        | 1 +
 .../watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-1082.json | 1 -
 .../watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-199.json  | 1 -
 .../galaxy-watch/samsung-galaxy-watch-scrapegsma-7867.json    | 1 -
 .../samsung-galaxy-watch-active2-scrapegsma-1501.json         | 1 -
 .../xiaomi/2019/mi-watch/xiaomi-mi-watch-scrapegsma-832.json  | 1 -
 291 files changed, 223 insertions(+), 291 deletions(-)

diff --git a/data/laptop/asus/2017/asus-f756ux-t4201d-i7-7500u-8gb-128gb/asus-f756ux-t4201d-i7-7500u-8gb-128gb-ammok-243.json b/data/laptop/asus/2017/asus-f756ux-t4201d-i7-7500u-8gb-128gb/asus-f756ux-t4201d-i7-7500u-8gb-128gb-ammok-243.json
index 58335696f52b7..451ce70ba8d55 100644
--- a/data/laptop/asus/2017/asus-f756ux-t4201d-i7-7500u-8gb-128gb/asus-f756ux-t4201d-i7-7500u-8gb-128gb-ammok-243.json
+++ b/data/laptop/asus/2017/asus-f756ux-t4201d-i7-7500u-8gb-128gb/asus-f756ux-t4201d-i7-7500u-8gb-128gb-ammok-243.json
@@ -11,7 +11,7 @@
   "gpu_name": "Nvidia GeForce GTX 950M",
   "gpu_type": "Dedicated",
   "ram_gb": 8,
-  "storage_gb": 1024,
+  "storage_gb": 128,
   "display": {
     "size_inch": 17.3,
     "resolution": "1920x1080",
diff --git a/data/laptop/asus/2017/asus-k756ux-t4340t-i5-7200u-8gb-500gb/asus-k756ux-t4340t-i5-7200u-8gb-500gb-ammok-229.json b/data/laptop/asus/2017/asus-k756ux-t4340t-i5-7200u-8gb-500gb/asus-k756ux-t4340t-i5-7200u-8gb-500gb-ammok-229.json
index 72c311d61c93a..5d6a64b134130 100644
--- a/data/laptop/asus/2017/asus-k756ux-t4340t-i5-7200u-8gb-500gb/asus-k756ux-t4340t-i5-7200u-8gb-500gb-ammok-229.json
+++ b/data/laptop/asus/2017/asus-k756ux-t4340t-i5-7200u-8gb-500gb/asus-k756ux-t4340t-i5-7200u-8gb-500gb-ammok-229.json
@@ -11,7 +11,7 @@
   "gpu_name": "Nvidia GeForce GTX 950M",
   "gpu_type": "Dedicated",
   "ram_gb": 8,
-  "storage_gb": 256,
+  "storage_gb": 500,
   "display": {
     "size_inch": 17.3,
     "resolution": "1920x1080",
diff --git a/data/laptop/asus/2017/asus-ux510ux-cn269t-i7-7500u-8gb-256gb/asus-ux510ux-cn269t-i7-7500u-8gb-256gb-ammok-333.json b/data/laptop/asus/2017/asus-ux510ux-cn269t-i7-7500u-8gb-256gb/asus-ux510ux-cn269t-i7-7500u-8gb-256gb-ammok-333.json
index 98582ea31a08c..8032f19c7b4d4 100644
--- a/data/laptop/asus/2017/asus-ux510ux-cn269t-i7-7500u-8gb-256gb/asus-ux510ux-cn269t-i7-7500u-8gb-256gb-ammok-333.json
+++ b/data/laptop/asus/2017/asus-ux510ux-cn269t-i7-7500u-8gb-256gb/asus-ux510ux-cn269t-i7-7500u-8gb-256gb-ammok-333.json
@@ -10,7 +10,7 @@
   "gpu_name": "Intel HD Graphics 620",
   "gpu_type": "Integrated",
   "ram_gb": 8,
-  "storage_gb": 1024,
+  "storage_gb": 256,
   "display": {
     "size_inch": 14.0,
     "resolution": "1920x1080",
diff --git a/data/monitor/acer/2023/acer-eda343cur/acer-eda343cur-amazonmon-177.json b/data/monitor/acer/2023/acer-eda343cur/acer-eda343cur-amazonmon-177.json
index 6ea3dfe39d75d..3ee6d39fcb6f6 100644
--- a/data/monitor/acer/2023/acer-eda343cur/acer-eda343cur-amazonmon-177.json
+++ b/data/monitor/acer/2023/acer-eda343cur/acer-eda343cur-amazonmon-177.json
@@ -7,7 +7,7 @@
   "msrp_usd": 280,
   "size_inch": 34.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "refresh_hz": 180,
   "curvature": "1000R",
   "ppi": 110,
diff --git a/data/monitor/asus/2023/asus-ve278h/asus-ve278h-amazonmon-844.json b/data/monitor/asus/2023/asus-ve278h/asus-ve278h-amazonmon-844.json
index 19a1c6da10bc0..2f2aeccee24e5 100644
--- a/data/monitor/asus/2023/asus-ve278h/asus-ve278h-amazonmon-844.json
+++ b/data/monitor/asus/2023/asus-ve278h/asus-ve278h-amazonmon-844.json
@@ -7,7 +7,7 @@
   "msrp_usd": 99,
   "size_inch": 27.0,
   "resolution": "1920x1080",
-  "aspect_ratio": "78:1",
+  "aspect_ratio": null,
   "ppi": 82,
   "rating": 4.6,
   "verified": false,
diff --git a/data/monitor/asus/2023/asus-vg328h1b/asus-vg328h1b-amazonmon-653.json b/data/monitor/asus/2023/asus-vg328h1b/asus-vg328h1b-amazonmon-653.json
index 497970a9ad29b..fcfe012333cbe 100644
--- a/data/monitor/asus/2023/asus-vg328h1b/asus-vg328h1b-amazonmon-653.json
+++ b/data/monitor/asus/2023/asus-vg328h1b/asus-vg328h1b-amazonmon-653.json
@@ -7,7 +7,7 @@
   "msrp_usd": 199,
   "size_inch": 32.0,
   "resolution": "1920x1080",
-  "aspect_ratio": "27:1",
+  "aspect_ratio": null,
   "refresh_hz": 165,
   "ppi": 69,
   "rating": 4.6,
diff --git a/data/monitor/dell/2023/dell-dell-inspiron-touchscreen/dell-dell-inspiron-touchscreen-amazonmon-206.json b/data/monitor/dell/2023/dell-dell-inspiron-touchscreen/dell-dell-inspiron-touchscreen-amazonmon-206.json
index 707eea6290083..6c8e50df7b869 100644
--- a/data/monitor/dell/2023/dell-dell-inspiron-touchscreen/dell-dell-inspiron-touchscreen-amazonmon-206.json
+++ b/data/monitor/dell/2023/dell-dell-inspiron-touchscreen/dell-dell-inspiron-touchscreen-amazonmon-206.json
@@ -5,7 +5,7 @@
   "brand": "dell",
   "release_date": "2023-01-01",
   "msrp_usd": 530,
-  "size_inch": 32.0,
+  "size_inch": 23.8,
   "resolution": "3840x2160",
   "aspect_ratio": "16:9",
   "ppi": 138,
diff --git a/data/monitor/dell/2023/dell-p3421w/dell-p3421w-amazonmon-384.json b/data/monitor/dell/2023/dell-p3421w/dell-p3421w-amazonmon-384.json
index b37245b4de029..99b1b7d751c2d 100644
--- a/data/monitor/dell/2023/dell-p3421w/dell-p3421w-amazonmon-384.json
+++ b/data/monitor/dell/2023/dell-p3421w/dell-p3421w-amazonmon-384.json
@@ -7,7 +7,7 @@
   "msrp_usd": 299,
   "size_inch": 34.1,
   "resolution": "2560x1440",
-  "aspect_ratio": "21:9",
+  "aspect_ratio": null,
   "ppi": 86,
   "rating": 3.8,
   "verified": false,
diff --git a/data/monitor/dell/2023/dell-s2240m/dell-s2240m-amazonmon-802.json b/data/monitor/dell/2023/dell-s2240m/dell-s2240m-amazonmon-802.json
index cf563f64c59e1..ba7341b674050 100644
--- a/data/monitor/dell/2023/dell-s2240m/dell-s2240m-amazonmon-802.json
+++ b/data/monitor/dell/2023/dell-s2240m/dell-s2240m-amazonmon-802.json
@@ -7,7 +7,7 @@
   "msrp_usd": 451,
   "size_inch": 21.5,
   "resolution": "1920x1080",
-  "aspect_ratio": "78:1",
+  "aspect_ratio": null,
   "ppi": 102,
   "rating": 4.5,
   "verified": false,
diff --git a/data/monitor/gigabyte/2023/gigabyte-gs34wqc/gigabyte-gs34wqc-amazonmon-779.json b/data/monitor/gigabyte/2023/gigabyte-gs34wqc/gigabyte-gs34wqc-amazonmon-779.json
index d53cffa3bef45..41ea0dc0d1065 100644
--- a/data/monitor/gigabyte/2023/gigabyte-gs34wqc/gigabyte-gs34wqc-amazonmon-779.json
+++ b/data/monitor/gigabyte/2023/gigabyte-gs34wqc/gigabyte-gs34wqc-amazonmon-779.json
@@ -7,7 +7,7 @@
   "msrp_usd": 793,
   "size_inch": 34.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "16:10",
+  "aspect_ratio": null,
   "refresh_hz": 120,
   "panel_type": "VA",
   "curvature": "1500R",
diff --git a/data/monitor/innocn/2023/innocn-hdr400/innocn-hdr400-amazonmon-218.json b/data/monitor/innocn/2023/innocn-hdr400/innocn-hdr400-amazonmon-218.json
index f8b8440a9671f..d363f259390eb 100644
--- a/data/monitor/innocn/2023/innocn-hdr400/innocn-hdr400-amazonmon-218.json
+++ b/data/monitor/innocn/2023/innocn-hdr400/innocn-hdr400-amazonmon-218.json
@@ -7,7 +7,7 @@
   "msrp_usd": 897,
   "size_inch": 43.8,
   "resolution": "3840x1080",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "refresh_hz": 120,
   "panel_type": "IPS",
   "hdr": "HDR400",
diff --git a/data/monitor/innoview/2023/innoview-innoview-portable-screen/innoview-innoview-portable-screen-amazonmon-669.json b/data/monitor/innoview/2023/innoview-innoview-portable-screen/innoview-innoview-portable-screen-amazonmon-669.json
index 44d71d0983a0f..a4aa3f9f4c4f1 100644
--- a/data/monitor/innoview/2023/innoview-innoview-portable-screen/innoview-innoview-portable-screen-amazonmon-669.json
+++ b/data/monitor/innoview/2023/innoview-innoview-portable-screen/innoview-innoview-portable-screen-amazonmon-669.json
@@ -7,7 +7,7 @@
   "msrp_usd": 450,
   "size_inch": 38.0,
   "resolution": "3840x2160",
-  "aspect_ratio": "78:1",
+  "aspect_ratio": null,
   "ppi": 116,
   "verified": false,
   "source_urls": [
diff --git a/data/monitor/lenovo/2023/lenovo-lenovo-thinkvision-full/lenovo-lenovo-thinkvision-full-amazonmon-465.json b/data/monitor/lenovo/2023/lenovo-lenovo-thinkvision-full/lenovo-lenovo-thinkvision-full-amazonmon-465.json
index b233f9872f807..7f8f1979cdfed 100644
--- a/data/monitor/lenovo/2023/lenovo-lenovo-thinkvision-full/lenovo-lenovo-thinkvision-full-amazonmon-465.json
+++ b/data/monitor/lenovo/2023/lenovo-lenovo-thinkvision-full/lenovo-lenovo-thinkvision-full-amazonmon-465.json
@@ -7,7 +7,7 @@
   "msrp_usd": 149,
   "size_inch": 22.0,
   "resolution": "1920x1080",
-  "aspect_ratio": "35:1",
+  "aspect_ratio": null,
   "ppi": 100,
   "verified": false,
   "source_urls": [
diff --git a/data/monitor/lenovo/2023/lenovo-p24h-30/lenovo-p24h-30-amazonmon-434.json b/data/monitor/lenovo/2023/lenovo-p24h-30/lenovo-p24h-30-amazonmon-434.json
index d45a42b255024..0fab30797e34d 100644
--- a/data/monitor/lenovo/2023/lenovo-p24h-30/lenovo-p24h-30-amazonmon-434.json
+++ b/data/monitor/lenovo/2023/lenovo-p24h-30/lenovo-p24h-30-amazonmon-434.json
@@ -7,7 +7,7 @@
   "msrp_usd": 434,
   "size_inch": 23.8,
   "resolution": "2560x1440",
-  "aspect_ratio": "30:1",
+  "aspect_ratio": null,
   "panel_type": "IPS",
   "ppi": 123,
   "rating": 5.0,
diff --git a/data/monitor/lg/2023/lg-34bq77qb/lg-34bq77qb-amazonmon-637.json b/data/monitor/lg/2023/lg-34bq77qb/lg-34bq77qb-amazonmon-637.json
index 380e79ffa9c06..c08437e57f00d 100644
--- a/data/monitor/lg/2023/lg-34bq77qb/lg-34bq77qb-amazonmon-637.json
+++ b/data/monitor/lg/2023/lg-34bq77qb/lg-34bq77qb-amazonmon-637.json
@@ -7,7 +7,7 @@
   "msrp_usd": 262,
   "size_inch": 34.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "40:1",
+  "aspect_ratio": null,
   "ppi": 110,
   "verified": false,
   "source_urls": [
diff --git a/data/monitor/lg/2023/lg-34gp63a/lg-34gp63a-amazonmon-109.json b/data/monitor/lg/2023/lg-34gp63a/lg-34gp63a-amazonmon-109.json
index 9ddb60f6a2cfc..32ee8d7c3c1c8 100644
--- a/data/monitor/lg/2023/lg-34gp63a/lg-34gp63a-amazonmon-109.json
+++ b/data/monitor/lg/2023/lg-34gp63a/lg-34gp63a-amazonmon-109.json
@@ -7,7 +7,7 @@
   "msrp_usd": 346,
   "size_inch": 34.0,
   "resolution": "2560x1440",
-  "aspect_ratio": "21:9",
+  "aspect_ratio": null,
   "refresh_hz": 160,
   "panel_type": "VA",
   "hdr": "HDR 10",
diff --git a/data/monitor/lg/2023/lg-34wl500/lg-34wl500-amazonmon-578.json b/data/monitor/lg/2023/lg-34wl500/lg-34wl500-amazonmon-578.json
index 2cac33786af4b..c722dde79e9e2 100644
--- a/data/monitor/lg/2023/lg-34wl500/lg-34wl500-amazonmon-578.json
+++ b/data/monitor/lg/2023/lg-34wl500/lg-34wl500-amazonmon-578.json
@@ -7,7 +7,7 @@
   "msrp_usd": 483,
   "size_inch": 34.0,
   "resolution": "1920x1080",
-  "aspect_ratio": "21:9",
+  "aspect_ratio": null,
   "panel_type": "IPS",
   "hdr": "HDR10",
   "ppi": 65,
diff --git a/data/monitor/lg/2023/lg-38bq88c/lg-38bq88c-amazonmon-648.json b/data/monitor/lg/2023/lg-38bq88c/lg-38bq88c-amazonmon-648.json
index 1a7993e702cfc..539288e86992f 100644
--- a/data/monitor/lg/2023/lg-38bq88c/lg-38bq88c-amazonmon-648.json
+++ b/data/monitor/lg/2023/lg-38bq88c/lg-38bq88c-amazonmon-648.json
@@ -6,8 +6,8 @@
   "release_date": "2023-01-01",
   "msrp_usd": 793,
   "size_inch": 38.0,
-  "resolution": "3840x2160",
-  "aspect_ratio": "21:9",
+  "resolution": "3840x1600",
+  "aspect_ratio": null,
   "ppi": 116,
   "verified": false,
   "source_urls": [
diff --git a/data/monitor/lg/2023/lg-lg-digital-signage/lg-lg-digital-signage-amazonmon-444.json b/data/monitor/lg/2023/lg-lg-digital-signage/lg-lg-digital-signage-amazonmon-444.json
index 956868d84d11c..fc68aa0ca4923 100644
--- a/data/monitor/lg/2023/lg-lg-digital-signage/lg-lg-digital-signage-amazonmon-444.json
+++ b/data/monitor/lg/2023/lg-lg-digital-signage/lg-lg-digital-signage-amazonmon-444.json
@@ -7,7 +7,7 @@
   "msrp_usd": 60,
   "size_inch": 49.0,
   "resolution": "3840x2160",
-  "aspect_ratio": "17:9",
+  "aspect_ratio": null,
   "ppi": 90,
   "rating": 5.0,
   "verified": false,
diff --git a/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-46.json b/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-46.json
index 6d4c99a0b25f7..791c657780218 100644
--- a/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-46.json
+++ b/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-46.json
@@ -7,7 +7,7 @@
   "msrp_usd": 340,
   "size_inch": 27.0,
   "resolution": "2560x1440",
-  "aspect_ratio": "35:1",
+  "aspect_ratio": null,
   "refresh_hz": 240,
   "hdr": "DisplayHDR 400",
   "ppi": 109,
diff --git a/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-466.json b/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-466.json
index 5851c7e23a421..aa2ff7bc1048b 100644
--- a/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-466.json
+++ b/data/monitor/lg/2023/lg-lg-ultragear-gaming/lg-lg-ultragear-gaming-amazonmon-466.json
@@ -7,7 +7,7 @@
   "msrp_usd": 248,
   "size_inch": 27.0,
   "resolution": "5120x1440",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "refresh_hz": 165,
   "ppi": 197,
   "verified": false,
diff --git a/data/monitor/lilliput/2023/lilliput-fa1014-np/lilliput-fa1014-np-amazonmon-767.json b/data/monitor/lilliput/2023/lilliput-fa1014-np/lilliput-fa1014-np-amazonmon-767.json
index dde6968162a28..46ff272e5b85f 100644
--- a/data/monitor/lilliput/2023/lilliput-fa1014-np/lilliput-fa1014-np-amazonmon-767.json
+++ b/data/monitor/lilliput/2023/lilliput-fa1014-np/lilliput-fa1014-np-amazonmon-767.json
@@ -5,8 +5,8 @@
   "brand": "lilliput",
   "release_date": "2023-01-01",
   "msrp_usd": 120,
-  "size_inch": 25.65,
-  "resolution": "1920x1080",
+  "size_inch": 10.1,
+  "resolution": "1280x800",
   "aspect_ratio": "16:9",
   "panel_type": "IPS",
   "ppi": 86,
diff --git a/data/monitor/lilliput/2023/lilliput-ip65/lilliput-ip65-amazonmon-612.json b/data/monitor/lilliput/2023/lilliput-ip65/lilliput-ip65-amazonmon-612.json
index de8891ddd88ae..32c466ddc4618 100644
--- a/data/monitor/lilliput/2023/lilliput-ip65/lilliput-ip65-amazonmon-612.json
+++ b/data/monitor/lilliput/2023/lilliput-ip65/lilliput-ip65-amazonmon-612.json
@@ -7,7 +7,7 @@
   "msrp_usd": 179,
   "size_inch": 7.0,
   "resolution": "1280x800",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "ppi": 216,
   "verified": false,
   "source_urls": [
diff --git a/data/monitor/msi/2023/msi-mag274upf/msi-mag274upf-amazonmon-108.json b/data/monitor/msi/2023/msi-mag274upf/msi-mag274upf-amazonmon-108.json
index 38a45e7740741..c1c8a26d80f0f 100644
--- a/data/monitor/msi/2023/msi-mag274upf/msi-mag274upf-amazonmon-108.json
+++ b/data/monitor/msi/2023/msi-mag274upf/msi-mag274upf-amazonmon-108.json
@@ -5,7 +5,7 @@
   "brand": "msi",
   "release_date": "2023-01-01",
   "msrp_usd": 370,
-  "size_inch": 32.0,
+  "size_inch": 27.0,
   "resolution": "3840x2160",
   "aspect_ratio": "16:9",
   "refresh_hz": 144,
diff --git a/data/monitor/msi/2023/msi-mp341cqw/msi-mp341cqw-amazonmon-377.json b/data/monitor/msi/2023/msi-mp341cqw/msi-mp341cqw-amazonmon-377.json
index aa1515a0fbba0..a67fa45c4809f 100644
--- a/data/monitor/msi/2023/msi-mp341cqw/msi-mp341cqw-amazonmon-377.json
+++ b/data/monitor/msi/2023/msi-mp341cqw/msi-mp341cqw-amazonmon-377.json
@@ -7,7 +7,7 @@
   "msrp_usd": 140,
   "size_inch": 34.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "refresh_hz": 100,
   "panel_type": "VA",
   "ppi": 110,
diff --git a/data/monitor/samsung/2023/samsung-g93sc/samsung-g93sc-amazonmon-9.json b/data/monitor/samsung/2023/samsung-g93sc/samsung-g93sc-amazonmon-9.json
index 31d103c157ab1..119ee4dbfee87 100644
--- a/data/monitor/samsung/2023/samsung-g93sc/samsung-g93sc-amazonmon-9.json
+++ b/data/monitor/samsung/2023/samsung-g93sc/samsung-g93sc-amazonmon-9.json
@@ -7,7 +7,7 @@
   "msrp_usd": 110,
   "size_inch": 49.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "32:9",
+  "aspect_ratio": null,
   "refresh_hz": 240,
   "panel_type": "OLED",
   "hdr": "DisplayHDR",
diff --git a/data/monitor/samsung/2023/samsung-samsung-business-curved/samsung-samsung-business-curved-amazonmon-59.json b/data/monitor/samsung/2023/samsung-samsung-business-curved/samsung-samsung-business-curved-amazonmon-59.json
index cc24a7466aa4d..2a2d7a6bd90d7 100644
--- a/data/monitor/samsung/2023/samsung-samsung-business-curved/samsung-samsung-business-curved-amazonmon-59.json
+++ b/data/monitor/samsung/2023/samsung-samsung-business-curved/samsung-samsung-business-curved-amazonmon-59.json
@@ -7,7 +7,7 @@
   "msrp_usd": 897,
   "size_inch": 49.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "32:9",
+  "aspect_ratio": null,
   "refresh_hz": 120,
   "hdr": "DisplayHDR 400",
   "ppi": 76,
diff --git a/data/monitor/samsung/2023/samsung-samsung-odyssey-series/samsung-samsung-odyssey-series-amazonmon-41.json b/data/monitor/samsung/2023/samsung-samsung-odyssey-series/samsung-samsung-odyssey-series-amazonmon-41.json
index 33adaf7e72169..0b9306760929f 100644
--- a/data/monitor/samsung/2023/samsung-samsung-odyssey-series/samsung-samsung-odyssey-series-amazonmon-41.json
+++ b/data/monitor/samsung/2023/samsung-samsung-odyssey-series/samsung-samsung-odyssey-series-amazonmon-41.json
@@ -7,7 +7,7 @@
   "msrp_usd": 333,
   "size_inch": 49.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "32:9",
+  "aspect_ratio": null,
   "refresh_hz": 240,
   "curvature": "1000R",
   "hdr": "DisplayHDR 1000",
diff --git a/data/monitor/samsung/2023/samsung-samsung-viewfinity-series/samsung-samsung-viewfinity-series-amazonmon-383.json b/data/monitor/samsung/2023/samsung-samsung-viewfinity-series/samsung-samsung-viewfinity-series-amazonmon-383.json
index 5240e9caca795..3c63e3b5d5bcc 100644
--- a/data/monitor/samsung/2023/samsung-samsung-viewfinity-series/samsung-samsung-viewfinity-series-amazonmon-383.json
+++ b/data/monitor/samsung/2023/samsung-samsung-viewfinity-series/samsung-samsung-viewfinity-series-amazonmon-383.json
@@ -7,7 +7,7 @@
   "msrp_usd": 797,
   "size_inch": 34.0,
   "resolution": "3440x1440",
-  "aspect_ratio": "16:9",
+  "aspect_ratio": null,
   "refresh_hz": 100,
   "panel_type": "IPS",
   "hdr": "HDR 10",
diff --git a/data/monitor/viewsonic/2023/viewsonic-vg2239smh/viewsonic-vg2239smh-amazonmon-573.json b/data/monitor/viewsonic/2023/viewsonic-vg2239smh/viewsonic-vg2239smh-amazonmon-573.json
index 4bb539253c7f7..c6fc7e1e7c883 100644
--- a/data/monitor/viewsonic/2023/viewsonic-vg2239smh/viewsonic-vg2239smh-amazonmon-573.json
+++ b/data/monitor/viewsonic/2023/viewsonic-vg2239smh/viewsonic-vg2239smh-amazonmon-573.json
@@ -7,7 +7,7 @@
   "msrp_usd": 100,
   "size_inch": 22.0,
   "resolution": "1920x1080",
-  "aspect_ratio": "78:1",
+  "aspect_ratio": null,
   "ppi": 100,
   "rating": 4.4,
   "verified": false,
diff --git a/data/tablet/acer/2011/iconia-tab-a100/acer-iconia-tab-a100-scrapegsma-1774.json b/data/tablet/acer/2011/iconia-tab-a100/acer-iconia-tab-a100-scrapegsma-1774.json
index 330fec6f7d2ce..b5290ae246748 100644
--- a/data/tablet/acer/2011/iconia-tab-a100/acer-iconia-tab-a100-scrapegsma-1774.json
+++ b/data/tablet/acer/2011/iconia-tab-a100/acer-iconia-tab-a100-scrapegsma-1774.json
@@ -35,7 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2011/iconia-tab-a101/acer-iconia-tab-a101-scrapegsma-1773.json b/data/tablet/acer/2011/iconia-tab-a101/acer-iconia-tab-a101-scrapegsma-1773.json
index b53ffef6a5997..e7c31f37580cd 100644
--- a/data/tablet/acer/2011/iconia-tab-a101/acer-iconia-tab-a101-scrapegsma-1773.json
+++ b/data/tablet/acer/2011/iconia-tab-a101/acer-iconia-tab-a101-scrapegsma-1773.json
@@ -38,7 +38,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2011/iconia-tab-a500/acer-iconia-tab-a500-scrapegsma-1772.json b/data/tablet/acer/2011/iconia-tab-a500/acer-iconia-tab-a500-scrapegsma-1772.json
index 2acd83296380b..dd00385e3c17a 100644
--- a/data/tablet/acer/2011/iconia-tab-a500/acer-iconia-tab-a500-scrapegsma-1772.json
+++ b/data/tablet/acer/2011/iconia-tab-a500/acer-iconia-tab-a500-scrapegsma-1772.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2011/iconia-tab-a501/acer-iconia-tab-a501-scrapegsma-1770.json b/data/tablet/acer/2011/iconia-tab-a501/acer-iconia-tab-a501-scrapegsma-1770.json
index 27a827e1b9d1f..bee701698d747 100644
--- a/data/tablet/acer/2011/iconia-tab-a501/acer-iconia-tab-a501-scrapegsma-1770.json
+++ b/data/tablet/acer/2011/iconia-tab-a501/acer-iconia-tab-a501-scrapegsma-1770.json
@@ -38,7 +38,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a110/acer-iconia-tab-a110-scrapegsma-1756.json b/data/tablet/acer/2012/iconia-tab-a110/acer-iconia-tab-a110-scrapegsma-1756.json
index 71696d1cce702..440f3ae28268d 100644
--- a/data/tablet/acer/2012/iconia-tab-a110/acer-iconia-tab-a110-scrapegsma-1756.json
+++ b/data/tablet/acer/2012/iconia-tab-a110/acer-iconia-tab-a110-scrapegsma-1756.json
@@ -35,7 +35,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a200/acer-iconia-tab-a200-scrapegsma-1763.json b/data/tablet/acer/2012/iconia-tab-a200/acer-iconia-tab-a200-scrapegsma-1763.json
index 403274dc2cdce..2d43fb4d8a9c3 100644
--- a/data/tablet/acer/2012/iconia-tab-a200/acer-iconia-tab-a200-scrapegsma-1763.json
+++ b/data/tablet/acer/2012/iconia-tab-a200/acer-iconia-tab-a200-scrapegsma-1763.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a210/acer-iconia-tab-a210-scrapegsma-1762.json b/data/tablet/acer/2012/iconia-tab-a210/acer-iconia-tab-a210-scrapegsma-1762.json
index 4ec313e4c439d..c8c96a91799f8 100644
--- a/data/tablet/acer/2012/iconia-tab-a210/acer-iconia-tab-a210-scrapegsma-1762.json
+++ b/data/tablet/acer/2012/iconia-tab-a210/acer-iconia-tab-a210-scrapegsma-1762.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a510/acer-iconia-tab-a510-scrapegsma-1767.json b/data/tablet/acer/2012/iconia-tab-a510/acer-iconia-tab-a510-scrapegsma-1767.json
index 723c065ae8f09..b04a9d0389f6a 100644
--- a/data/tablet/acer/2012/iconia-tab-a510/acer-iconia-tab-a510-scrapegsma-1767.json
+++ b/data/tablet/acer/2012/iconia-tab-a510/acer-iconia-tab-a510-scrapegsma-1767.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a511/acer-iconia-tab-a511-scrapegsma-1766.json b/data/tablet/acer/2012/iconia-tab-a511/acer-iconia-tab-a511-scrapegsma-1766.json
index 77734b82713c3..2c417856a307d 100644
--- a/data/tablet/acer/2012/iconia-tab-a511/acer-iconia-tab-a511-scrapegsma-1766.json
+++ b/data/tablet/acer/2012/iconia-tab-a511/acer-iconia-tab-a511-scrapegsma-1766.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a700/acer-iconia-tab-a700-scrapegsma-1765.json b/data/tablet/acer/2012/iconia-tab-a700/acer-iconia-tab-a700-scrapegsma-1765.json
index 422bafce9e388..587cb279399ef 100644
--- a/data/tablet/acer/2012/iconia-tab-a700/acer-iconia-tab-a700-scrapegsma-1765.json
+++ b/data/tablet/acer/2012/iconia-tab-a700/acer-iconia-tab-a700-scrapegsma-1765.json
@@ -35,7 +35,8 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2012/iconia-tab-a701/acer-iconia-tab-a701-scrapegsma-1764.json b/data/tablet/acer/2012/iconia-tab-a701/acer-iconia-tab-a701-scrapegsma-1764.json
index d36bb1e516995..712aca9be7836 100644
--- a/data/tablet/acer/2012/iconia-tab-a701/acer-iconia-tab-a701-scrapegsma-1764.json
+++ b/data/tablet/acer/2012/iconia-tab-a701/acer-iconia-tab-a701-scrapegsma-1764.json
@@ -38,7 +38,8 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2013/iconia-tab-a1-810/acer-iconia-tab-a1-810-scrapegsma-1749.json b/data/tablet/acer/2013/iconia-tab-a1-810/acer-iconia-tab-a1-810-scrapegsma-1749.json
index f091caa12e6e4..1455d82d7d86a 100644
--- a/data/tablet/acer/2013/iconia-tab-a1-810/acer-iconia-tab-a1-810-scrapegsma-1749.json
+++ b/data/tablet/acer/2013/iconia-tab-a1-810/acer-iconia-tab-a1-810-scrapegsma-1749.json
@@ -35,7 +35,7 @@
     "ppi": 162
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2013/iconia-tab-a1-811/acer-iconia-tab-a1-811-scrapegsma-1748.json b/data/tablet/acer/2013/iconia-tab-a1-811/acer-iconia-tab-a1-811-scrapegsma-1748.json
index 94092c62927cc..546fb88faa0d8 100644
--- a/data/tablet/acer/2013/iconia-tab-a1-811/acer-iconia-tab-a1-811-scrapegsma-1748.json
+++ b/data/tablet/acer/2013/iconia-tab-a1-811/acer-iconia-tab-a1-811-scrapegsma-1748.json
@@ -38,7 +38,6 @@
     "ppi": 162
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2013/iconia-tab-a3/acer-iconia-tab-a3-scrapegsma-1747.json b/data/tablet/acer/2013/iconia-tab-a3/acer-iconia-tab-a3-scrapegsma-1747.json
index 6e7aca4b228e6..6c4f6f4f1cc4f 100644
--- a/data/tablet/acer/2013/iconia-tab-a3/acer-iconia-tab-a3-scrapegsma-1747.json
+++ b/data/tablet/acer/2013/iconia-tab-a3/acer-iconia-tab-a3-scrapegsma-1747.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2013/iconia-tab-b1-710/acer-iconia-tab-b1-710-scrapegsma-1754.json b/data/tablet/acer/2013/iconia-tab-b1-710/acer-iconia-tab-b1-710-scrapegsma-1754.json
index e00246746af6a..c174b6bd66e3c 100644
--- a/data/tablet/acer/2013/iconia-tab-b1-710/acer-iconia-tab-b1-710-scrapegsma-1754.json
+++ b/data/tablet/acer/2013/iconia-tab-b1-710/acer-iconia-tab-b1-710-scrapegsma-1754.json
@@ -35,7 +35,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2013/iconia-tab-b1-a71/acer-iconia-tab-b1-a71-scrapegsma-1755.json b/data/tablet/acer/2013/iconia-tab-b1-a71/acer-iconia-tab-b1-a71-scrapegsma-1755.json
index 68dc8d562b8aa..c24b9fec1b08a 100644
--- a/data/tablet/acer/2013/iconia-tab-b1-a71/acer-iconia-tab-b1-a71-scrapegsma-1755.json
+++ b/data/tablet/acer/2013/iconia-tab-b1-a71/acer-iconia-tab-b1-a71-scrapegsma-1755.json
@@ -35,6 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2014/iconia-tab-7-a1-713/acer-iconia-tab-7-a1-713-scrapegsma-1734.json b/data/tablet/acer/2014/iconia-tab-7-a1-713/acer-iconia-tab-7-a1-713-scrapegsma-1734.json
index 10620ae6adc27..4a3bfe02437eb 100644
--- a/data/tablet/acer/2014/iconia-tab-7-a1-713/acer-iconia-tab-7-a1-713-scrapegsma-1734.json
+++ b/data/tablet/acer/2014/iconia-tab-7-a1-713/acer-iconia-tab-7-a1-713-scrapegsma-1734.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2014/iconia-tab-7-a1-713hd/acer-iconia-tab-7-a1-713hd-scrapegsma-1735.json b/data/tablet/acer/2014/iconia-tab-7-a1-713hd/acer-iconia-tab-7-a1-713hd-scrapegsma-1735.json
index d1a62db73f57f..edccdd6d6426b 100644
--- a/data/tablet/acer/2014/iconia-tab-7-a1-713hd/acer-iconia-tab-7-a1-713hd-scrapegsma-1735.json
+++ b/data/tablet/acer/2014/iconia-tab-7-a1-713hd/acer-iconia-tab-7-a1-713hd-scrapegsma-1735.json
@@ -38,7 +38,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2014/iconia-tab-8-a1-840fhd/acer-iconia-tab-8-a1-840fhd-scrapegsma-1733.json b/data/tablet/acer/2014/iconia-tab-8-a1-840fhd/acer-iconia-tab-8-a1-840fhd-scrapegsma-1733.json
index 24e8ecc4e23df..71627b8c9aa12 100644
--- a/data/tablet/acer/2014/iconia-tab-8-a1-840fhd/acer-iconia-tab-8-a1-840fhd-scrapegsma-1733.json
+++ b/data/tablet/acer/2014/iconia-tab-8-a1-840fhd/acer-iconia-tab-8-a1-840fhd-scrapegsma-1733.json
@@ -35,7 +35,7 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2015/iconia-tab-10-a3-a30/acer-iconia-tab-10-a3-a30-scrapegsma-1719.json b/data/tablet/acer/2015/iconia-tab-10-a3-a30/acer-iconia-tab-10-a3-a30-scrapegsma-1719.json
index 51c72106cf933..0c7fad063a161 100644
--- a/data/tablet/acer/2015/iconia-tab-10-a3-a30/acer-iconia-tab-10-a3-a30-scrapegsma-1719.json
+++ b/data/tablet/acer/2015/iconia-tab-10-a3-a30/acer-iconia-tab-10-a3-a30-scrapegsma-1719.json
@@ -35,7 +35,8 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/acer/2018/chromebook-tab-10/acer-chromebook-tab-10-scrapegsma-1700.json b/data/tablet/acer/2018/chromebook-tab-10/acer-chromebook-tab-10-scrapegsma-1700.json
index fbd11fb3dbf4b..f9cbdec41511b 100644
--- a/data/tablet/acer/2018/chromebook-tab-10/acer-chromebook-tab-10-scrapegsma-1700.json
+++ b/data/tablet/acer/2018/chromebook-tab-10/acer-chromebook-tab-10-scrapegsma-1700.json
@@ -35,7 +35,6 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    4,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/alcatel/2013/one-touch-tab-7-hd/alcatel-one-touch-tab-7-hd-scrapegsma-1691.json b/data/tablet/alcatel/2013/one-touch-tab-7-hd/alcatel-one-touch-tab-7-hd-scrapegsma-1691.json
index 52da9b49f0da8..b31290bc339f8 100644
--- a/data/tablet/alcatel/2013/one-touch-tab-7-hd/alcatel-one-touch-tab-7-hd-scrapegsma-1691.json
+++ b/data/tablet/alcatel/2013/one-touch-tab-7-hd/alcatel-one-touch-tab-7-hd-scrapegsma-1691.json
@@ -35,7 +35,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/alcatel/2013/one-touch-tab-7/alcatel-one-touch-tab-7-scrapegsma-1690.json b/data/tablet/alcatel/2013/one-touch-tab-7/alcatel-one-touch-tab-7-scrapegsma-1690.json
index fc966873c1cdb..9c09983d0637c 100644
--- a/data/tablet/alcatel/2013/one-touch-tab-7/alcatel-one-touch-tab-7-scrapegsma-1690.json
+++ b/data/tablet/alcatel/2013/one-touch-tab-7/alcatel-one-touch-tab-7-scrapegsma-1690.json
@@ -35,7 +35,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/tablet/amazon/2017/fire-hd-10-2017/amazon-fire-hd-10-2017-scrapegsma-2291.json b/data/tablet/amazon/2017/fire-hd-10-2017/amazon-fire-hd-10-2017-scrapegsma-2291.json
index 8640f803c00a5..96ce1825f3173 100644
--- a/data/tablet/amazon/2017/fire-hd-10-2017/amazon-fire-hd-10-2017-scrapegsma-2291.json
+++ b/data/tablet/amazon/2017/fire-hd-10-2017/amazon-fire-hd-10-2017-scrapegsma-2291.json
@@ -35,7 +35,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/amazon/2017/fire-hd-8-2017/amazon-fire-hd-8-2017-scrapegsma-2292.json b/data/tablet/amazon/2017/fire-hd-8-2017/amazon-fire-hd-8-2017-scrapegsma-2292.json
index 347fc1a1599bd..191dd14b37cbb 100644
--- a/data/tablet/amazon/2017/fire-hd-8-2017/amazon-fire-hd-8-2017-scrapegsma-2292.json
+++ b/data/tablet/amazon/2017/fire-hd-8-2017/amazon-fire-hd-8-2017-scrapegsma-2292.json
@@ -35,7 +35,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2010/ipad-wi-fi-3g/apple-ipad-wi-fi-3g-scrapegsma-2406.json b/data/tablet/apple/2010/ipad-wi-fi-3g/apple-ipad-wi-fi-3g-scrapegsma-2406.json
index 7293a5751c929..0acb60fe87c61 100644
--- a/data/tablet/apple/2010/ipad-wi-fi-3g/apple-ipad-wi-fi-3g-scrapegsma-2406.json
+++ b/data/tablet/apple/2010/ipad-wi-fi-3g/apple-ipad-wi-fi-3g-scrapegsma-2406.json
@@ -38,6 +38,8 @@
     "ppi": 132
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2010/ipad-wi-fi/apple-ipad-wi-fi-scrapegsma-2407.json b/data/tablet/apple/2010/ipad-wi-fi/apple-ipad-wi-fi-scrapegsma-2407.json
index 0dfac4389706d..5346e8e70353d 100644
--- a/data/tablet/apple/2010/ipad-wi-fi/apple-ipad-wi-fi-scrapegsma-2407.json
+++ b/data/tablet/apple/2010/ipad-wi-fi/apple-ipad-wi-fi-scrapegsma-2407.json
@@ -35,6 +35,8 @@
     "ppi": 132
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2011/ipad-2-cdma/apple-ipad-2-cdma-scrapegsma-2403.json b/data/tablet/apple/2011/ipad-2-cdma/apple-ipad-2-cdma-scrapegsma-2403.json
index dfcfe90c93584..9591981535f9e 100644
--- a/data/tablet/apple/2011/ipad-2-cdma/apple-ipad-2-cdma-scrapegsma-2403.json
+++ b/data/tablet/apple/2011/ipad-2-cdma/apple-ipad-2-cdma-scrapegsma-2403.json
@@ -35,6 +35,8 @@
     "ppi": 132
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2011/ipad-2-wi-fi-3g/apple-ipad-2-wi-fi-3g-scrapegsma-2401.json b/data/tablet/apple/2011/ipad-2-wi-fi-3g/apple-ipad-2-wi-fi-3g-scrapegsma-2401.json
index 92db652351ca3..e342184c725d7 100644
--- a/data/tablet/apple/2011/ipad-2-wi-fi-3g/apple-ipad-2-wi-fi-3g-scrapegsma-2401.json
+++ b/data/tablet/apple/2011/ipad-2-wi-fi-3g/apple-ipad-2-wi-fi-3g-scrapegsma-2401.json
@@ -38,6 +38,8 @@
     "ppi": 132
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2011/ipad-2-wi-fi/apple-ipad-2-wi-fi-scrapegsma-2402.json b/data/tablet/apple/2011/ipad-2-wi-fi/apple-ipad-2-wi-fi-scrapegsma-2402.json
index d215c02d0406c..d1d1d9f974ea1 100644
--- a/data/tablet/apple/2011/ipad-2-wi-fi/apple-ipad-2-wi-fi-scrapegsma-2402.json
+++ b/data/tablet/apple/2011/ipad-2-wi-fi/apple-ipad-2-wi-fi-scrapegsma-2402.json
@@ -35,6 +35,8 @@
     "ppi": 132
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-3-wi-fi-cellular/apple-ipad-3-wi-fi-cellular-scrapegsma-2398.json b/data/tablet/apple/2012/ipad-3-wi-fi-cellular/apple-ipad-3-wi-fi-cellular-scrapegsma-2398.json
index f6eec4717d532..0bd435d97d816 100644
--- a/data/tablet/apple/2012/ipad-3-wi-fi-cellular/apple-ipad-3-wi-fi-cellular-scrapegsma-2398.json
+++ b/data/tablet/apple/2012/ipad-3-wi-fi-cellular/apple-ipad-3-wi-fi-cellular-scrapegsma-2398.json
@@ -38,7 +38,8 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-3-wi-fi/apple-ipad-3-wi-fi-scrapegsma-2399.json b/data/tablet/apple/2012/ipad-3-wi-fi/apple-ipad-3-wi-fi-scrapegsma-2399.json
index 772cb649cf913..fb8116cc5e6d0 100644
--- a/data/tablet/apple/2012/ipad-3-wi-fi/apple-ipad-3-wi-fi-scrapegsma-2399.json
+++ b/data/tablet/apple/2012/ipad-3-wi-fi/apple-ipad-3-wi-fi-scrapegsma-2399.json
@@ -35,7 +35,8 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-4-wi-fi-cellular/apple-ipad-4-wi-fi-cellular-scrapegsma-2396.json b/data/tablet/apple/2012/ipad-4-wi-fi-cellular/apple-ipad-4-wi-fi-cellular-scrapegsma-2396.json
index 511d4b3b93190..fb848b63cb104 100644
--- a/data/tablet/apple/2012/ipad-4-wi-fi-cellular/apple-ipad-4-wi-fi-cellular-scrapegsma-2396.json
+++ b/data/tablet/apple/2012/ipad-4-wi-fi-cellular/apple-ipad-4-wi-fi-cellular-scrapegsma-2396.json
@@ -38,7 +38,9 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-4-wi-fi/apple-ipad-4-wi-fi-scrapegsma-2395.json b/data/tablet/apple/2012/ipad-4-wi-fi/apple-ipad-4-wi-fi-scrapegsma-2395.json
index ce9cca5f2476a..6d75b1173989a 100644
--- a/data/tablet/apple/2012/ipad-4-wi-fi/apple-ipad-4-wi-fi-scrapegsma-2395.json
+++ b/data/tablet/apple/2012/ipad-4-wi-fi/apple-ipad-4-wi-fi-scrapegsma-2395.json
@@ -35,7 +35,9 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-mini-wi-fi-cellular/apple-ipad-mini-wi-fi-cellular-scrapegsma-2394.json b/data/tablet/apple/2012/ipad-mini-wi-fi-cellular/apple-ipad-mini-wi-fi-cellular-scrapegsma-2394.json
index 184b9314788d2..81c69d9c6d4f0 100644
--- a/data/tablet/apple/2012/ipad-mini-wi-fi-cellular/apple-ipad-mini-wi-fi-cellular-scrapegsma-2394.json
+++ b/data/tablet/apple/2012/ipad-mini-wi-fi-cellular/apple-ipad-mini-wi-fi-cellular-scrapegsma-2394.json
@@ -38,6 +38,8 @@
     "ppi": 162
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2012/ipad-mini-wi-fi/apple-ipad-mini-wi-fi-scrapegsma-2393.json b/data/tablet/apple/2012/ipad-mini-wi-fi/apple-ipad-mini-wi-fi-scrapegsma-2393.json
index bb478d604e4c0..26b8e21f54dce 100644
--- a/data/tablet/apple/2012/ipad-mini-wi-fi/apple-ipad-mini-wi-fi-scrapegsma-2393.json
+++ b/data/tablet/apple/2012/ipad-mini-wi-fi/apple-ipad-mini-wi-fi-scrapegsma-2393.json
@@ -35,6 +35,8 @@
     "ppi": 162
   },
   "storage_options_gb": [
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2013/ipad-air/apple-ipad-air-scrapegsma-2389.json b/data/tablet/apple/2013/ipad-air/apple-ipad-air-scrapegsma-2389.json
index 79bc26ae1a884..933ac2b836b8b 100644
--- a/data/tablet/apple/2013/ipad-air/apple-ipad-air-scrapegsma-2389.json
+++ b/data/tablet/apple/2013/ipad-air/apple-ipad-air-scrapegsma-2389.json
@@ -38,7 +38,9 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2013/ipad-mini-2/apple-ipad-mini-2-scrapegsma-2390.json b/data/tablet/apple/2013/ipad-mini-2/apple-ipad-mini-2-scrapegsma-2390.json
index af58e6a2f01c3..38630bdd3f8d2 100644
--- a/data/tablet/apple/2013/ipad-mini-2/apple-ipad-mini-2-scrapegsma-2390.json
+++ b/data/tablet/apple/2013/ipad-mini-2/apple-ipad-mini-2-scrapegsma-2390.json
@@ -38,7 +38,9 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2014/ipad-air-2/apple-ipad-air-2-scrapegsma-2385.json b/data/tablet/apple/2014/ipad-air-2/apple-ipad-air-2-scrapegsma-2385.json
index 55b8048c8f77b..3442ad8073936 100644
--- a/data/tablet/apple/2014/ipad-air-2/apple-ipad-air-2-scrapegsma-2385.json
+++ b/data/tablet/apple/2014/ipad-air-2/apple-ipad-air-2-scrapegsma-2385.json
@@ -38,7 +38,9 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    2,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2014/ipad-mini-3/apple-ipad-mini-3-scrapegsma-2386.json b/data/tablet/apple/2014/ipad-mini-3/apple-ipad-mini-3-scrapegsma-2386.json
index 2e0e16243c7a9..da39f74745f57 100644
--- a/data/tablet/apple/2014/ipad-mini-3/apple-ipad-mini-3-scrapegsma-2386.json
+++ b/data/tablet/apple/2014/ipad-mini-3/apple-ipad-mini-3-scrapegsma-2386.json
@@ -38,7 +38,8 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    1,
+    16,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2015/ipad-mini-4/apple-ipad-mini-4-scrapegsma-2378.json b/data/tablet/apple/2015/ipad-mini-4/apple-ipad-mini-4-scrapegsma-2378.json
index 5739ff7763e9e..65ba778732ce1 100644
--- a/data/tablet/apple/2015/ipad-mini-4/apple-ipad-mini-4-scrapegsma-2378.json
+++ b/data/tablet/apple/2015/ipad-mini-4/apple-ipad-mini-4-scrapegsma-2378.json
@@ -38,7 +38,9 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    2,
+    16,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-4gb-256gb-4g-lte.json b/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-4gb-256gb-4g-lte.json
index 6fb7728083bfa..2defa1dc53106 100644
--- a/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-4gb-256gb-4g-lte.json
+++ b/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-4gb-256gb-4g-lte.json
@@ -4,7 +4,7 @@
   "brand": "apple",
   "release_date": "2015-09-01",
   "ram_gb": 4.0,
-  "battery_mah": 307,
+  "battery_mah": 10307,
   "weight_g": 713.0,
   "os": "iOS 9, upgradable to iPadOS 16.7.7",
   "verified": false,
diff --git a/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-scrapegsma-2377.json b/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-scrapegsma-2377.json
index 10d96f6fd6b07..9f01d719614d6 100644
--- a/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-scrapegsma-2377.json
+++ b/data/tablet/apple/2015/ipad-pro-12-9-2015/apple-ipad-pro-12-9-2015-scrapegsma-2377.json
@@ -38,7 +38,8 @@
     "ppi": 265
   },
   "storage_options_gb": [
-    4,
+    32,
+    128,
     256
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2016/ipad-pro-9-7-2016/apple-ipad-pro-9-7-2016-scrapegsma-2373.json b/data/tablet/apple/2016/ipad-pro-9-7-2016/apple-ipad-pro-9-7-2016-scrapegsma-2373.json
index 8868b9bad3b20..d675bcbf989d7 100644
--- a/data/tablet/apple/2016/ipad-pro-9-7-2016/apple-ipad-pro-9-7-2016-scrapegsma-2373.json
+++ b/data/tablet/apple/2016/ipad-pro-9-7-2016/apple-ipad-pro-9-7-2016-scrapegsma-2373.json
@@ -38,7 +38,8 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    2,
+    32,
+    128,
     256
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2017/ipad-9-7-2017/apple-ipad-9-7-2017-scrapegsma-2362.json b/data/tablet/apple/2017/ipad-9-7-2017/apple-ipad-9-7-2017-scrapegsma-2362.json
index abc4e611f66f8..bfb5db4cb316b 100644
--- a/data/tablet/apple/2017/ipad-9-7-2017/apple-ipad-9-7-2017-scrapegsma-2362.json
+++ b/data/tablet/apple/2017/ipad-9-7-2017/apple-ipad-9-7-2017-scrapegsma-2362.json
@@ -38,7 +38,7 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    2,
+    32,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2017/ipad-pro-10-5-2017/apple-ipad-pro-10-5-2017-scrapegsma-2361.json b/data/tablet/apple/2017/ipad-pro-10-5-2017/apple-ipad-pro-10-5-2017-scrapegsma-2361.json
index 242b2289a1401..b2f5df05282fa 100644
--- a/data/tablet/apple/2017/ipad-pro-10-5-2017/apple-ipad-pro-10-5-2017-scrapegsma-2361.json
+++ b/data/tablet/apple/2017/ipad-pro-10-5-2017/apple-ipad-pro-10-5-2017-scrapegsma-2361.json
@@ -38,7 +38,8 @@
     "ppi": 265
   },
   "storage_options_gb": [
-    4,
+    64,
+    256,
     512
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-4gb-512gb-4g-lte.json b/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-4gb-512gb-4g-lte.json
index c3da2bf66c25f..8a49475490755 100644
--- a/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-4gb-512gb-4g-lte.json
+++ b/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-4gb-512gb-4g-lte.json
@@ -4,7 +4,7 @@
   "brand": "apple",
   "release_date": "2017-06-01",
   "ram_gb": 4.0,
-  "battery_mah": 891,
+  "battery_mah": 10891,
   "weight_g": 677.0,
   "os": "iOS 10.3.2, upgradable to iPadOS 17.6.1",
   "verified": false,
diff --git a/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-scrapegsma-2360.json b/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-scrapegsma-2360.json
index 6b3587207ca59..3a81af6c0f00d 100644
--- a/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-scrapegsma-2360.json
+++ b/data/tablet/apple/2017/ipad-pro-12-9-2017/apple-ipad-pro-12-9-2017-scrapegsma-2360.json
@@ -38,7 +38,8 @@
     "ppi": 265
   },
   "storage_options_gb": [
-    4,
+    64,
+    256,
     512
   ],
   "connectivity": {
diff --git a/data/tablet/apple/2019/ipad-mini-2019/apple-ipad-mini-2019-scrapegsma-2345.json b/data/tablet/apple/2019/ipad-mini-2019/apple-ipad-mini-2019-scrapegsma-2345.json
index a0e62946e3c5b..722d0cba34abd 100644
--- a/data/tablet/apple/2019/ipad-mini-2019/apple-ipad-mini-2019-scrapegsma-2345.json
+++ b/data/tablet/apple/2019/ipad-mini-2019/apple-ipad-mini-2019-scrapegsma-2345.json
@@ -48,7 +48,7 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    3,
+    64,
     256
   ],
   "connectivity": {
diff --git a/data/tablet/archos/2017/diamond-tab/archos-diamond-tab-scrapegsma-2418.json b/data/tablet/archos/2017/diamond-tab/archos-diamond-tab-scrapegsma-2418.json
index c2908b8df21ed..1a1aab0dcfef5 100644
--- a/data/tablet/archos/2017/diamond-tab/archos-diamond-tab-scrapegsma-2418.json
+++ b/data/tablet/archos/2017/diamond-tab/archos-diamond-tab-scrapegsma-2418.json
@@ -38,7 +38,6 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2012/google-nexus-7-cellular/asus-google-nexus-7-cellular-scrapegsma-2588.json b/data/tablet/asus/2012/google-nexus-7-cellular/asus-google-nexus-7-cellular-scrapegsma-2588.json
index 7367deaf98126..b28fe66be4343 100644
--- a/data/tablet/asus/2012/google-nexus-7-cellular/asus-google-nexus-7-cellular-scrapegsma-2588.json
+++ b/data/tablet/asus/2012/google-nexus-7-cellular/asus-google-nexus-7-cellular-scrapegsma-2588.json
@@ -38,7 +38,7 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2012/google-nexus-7/asus-google-nexus-7-scrapegsma-2591.json b/data/tablet/asus/2012/google-nexus-7/asus-google-nexus-7-scrapegsma-2591.json
index b44250a0d2009..5b3f04acb809c 100644
--- a/data/tablet/asus/2012/google-nexus-7/asus-google-nexus-7-scrapegsma-2591.json
+++ b/data/tablet/asus/2012/google-nexus-7/asus-google-nexus-7-scrapegsma-2591.json
@@ -35,7 +35,8 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2012/padfone-2/asus-padfone-2-scrapegsma-2590.json b/data/tablet/asus/2012/padfone-2/asus-padfone-2-scrapegsma-2590.json
index 4888d64db4910..4359cc23ee296 100644
--- a/data/tablet/asus/2012/padfone-2/asus-padfone-2-scrapegsma-2590.json
+++ b/data/tablet/asus/2012/padfone-2/asus-padfone-2-scrapegsma-2590.json
@@ -38,7 +38,8 @@
     "ppi": 312
   },
   "storage_options_gb": [
-    2,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2012/padfone/asus-padfone-scrapegsma-2600.json b/data/tablet/asus/2012/padfone/asus-padfone-scrapegsma-2600.json
index 4f4c7d81d2027..94050dcfc5307 100644
--- a/data/tablet/asus/2012/padfone/asus-padfone-scrapegsma-2600.json
+++ b/data/tablet/asus/2012/padfone/asus-padfone-scrapegsma-2600.json
@@ -39,7 +39,8 @@
     "ppi": 256
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/google-nexus-7-2013/asus-google-nexus-7-2013-scrapegsma-2578.json b/data/tablet/asus/2013/google-nexus-7-2013/asus-google-nexus-7-2013-scrapegsma-2578.json
index 4b8c23641ac4a..45bcf72d7e7c1 100644
--- a/data/tablet/asus/2013/google-nexus-7-2013/asus-google-nexus-7-2013-scrapegsma-2578.json
+++ b/data/tablet/asus/2013/google-nexus-7-2013/asus-google-nexus-7-2013-scrapegsma-2578.json
@@ -38,7 +38,7 @@
     "ppi": 323
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/memo-pad-10/asus-memo-pad-10-scrapegsma-2575.json b/data/tablet/asus/2013/memo-pad-10/asus-memo-pad-10-scrapegsma-2575.json
index 709cc7edd4f06..d300beb3b02ff 100644
--- a/data/tablet/asus/2013/memo-pad-10/asus-memo-pad-10-scrapegsma-2575.json
+++ b/data/tablet/asus/2013/memo-pad-10/asus-memo-pad-10-scrapegsma-2575.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/memo-pad-8-me180a/asus-memo-pad-8-me180a-scrapegsma-2576.json b/data/tablet/asus/2013/memo-pad-8-me180a/asus-memo-pad-8-me180a-scrapegsma-2576.json
index 9d16fe3720250..848a342b3c597 100644
--- a/data/tablet/asus/2013/memo-pad-8-me180a/asus-memo-pad-8-me180a-scrapegsma-2576.json
+++ b/data/tablet/asus/2013/memo-pad-8-me180a/asus-memo-pad-8-me180a-scrapegsma-2576.json
@@ -35,7 +35,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/memo-pad-fhd10/asus-memo-pad-fhd10-scrapegsma-2581.json b/data/tablet/asus/2013/memo-pad-fhd10/asus-memo-pad-fhd10-scrapegsma-2581.json
index 901897a718cf7..7acabbbfd453e 100644
--- a/data/tablet/asus/2013/memo-pad-fhd10/asus-memo-pad-fhd10-scrapegsma-2581.json
+++ b/data/tablet/asus/2013/memo-pad-fhd10/asus-memo-pad-fhd10-scrapegsma-2581.json
@@ -35,7 +35,7 @@
     "ppi": 226
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/memo-pad-me172v/asus-memo-pad-me172v-scrapegsma-2587.json b/data/tablet/asus/2013/memo-pad-me172v/asus-memo-pad-me172v-scrapegsma-2587.json
index f420816783721..bfaf8af05310c 100644
--- a/data/tablet/asus/2013/memo-pad-me172v/asus-memo-pad-me172v-scrapegsma-2587.json
+++ b/data/tablet/asus/2013/memo-pad-me172v/asus-memo-pad-me172v-scrapegsma-2587.json
@@ -35,7 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/padfone-infinity-2/asus-padfone-infinity-2-scrapegsma-2574.json b/data/tablet/asus/2013/padfone-infinity-2/asus-padfone-infinity-2-scrapegsma-2574.json
index 7d59676640a99..0812bf5f3ceb1 100644
--- a/data/tablet/asus/2013/padfone-infinity-2/asus-padfone-infinity-2-scrapegsma-2574.json
+++ b/data/tablet/asus/2013/padfone-infinity-2/asus-padfone-infinity-2-scrapegsma-2574.json
@@ -38,7 +38,7 @@
     "ppi": 441
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/padfone-infinity/asus-padfone-infinity-scrapegsma-2585.json b/data/tablet/asus/2013/padfone-infinity/asus-padfone-infinity-scrapegsma-2585.json
index fc3e7e29970ce..d6f97fc21cb1c 100644
--- a/data/tablet/asus/2013/padfone-infinity/asus-padfone-infinity-scrapegsma-2585.json
+++ b/data/tablet/asus/2013/padfone-infinity/asus-padfone-infinity-scrapegsma-2585.json
@@ -38,7 +38,7 @@
     "ppi": 441
   },
   "storage_options_gb": [
-    2,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2013/padfone-mini/asus-padfone-mini-scrapegsma-2572.json b/data/tablet/asus/2013/padfone-mini/asus-padfone-mini-scrapegsma-2572.json
index 753dbc79f651a..039cd1ea8fb98 100644
--- a/data/tablet/asus/2013/padfone-mini/asus-padfone-mini-scrapegsma-2572.json
+++ b/data/tablet/asus/2013/padfone-mini/asus-padfone-mini-scrapegsma-2572.json
@@ -38,7 +38,6 @@
     "ppi": 256
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-10-me103k/asus-memo-pad-10-me103k-scrapegsma-2546.json b/data/tablet/asus/2014/memo-pad-10-me103k/asus-memo-pad-10-me103k-scrapegsma-2546.json
index 38143955bbbfa..96af1e8be68ca 100644
--- a/data/tablet/asus/2014/memo-pad-10-me103k/asus-memo-pad-10-me103k-scrapegsma-2546.json
+++ b/data/tablet/asus/2014/memo-pad-10-me103k/asus-memo-pad-10-me103k-scrapegsma-2546.json
@@ -35,7 +35,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-7-me176c/asus-memo-pad-7-me176c-scrapegsma-2554.json b/data/tablet/asus/2014/memo-pad-7-me176c/asus-memo-pad-7-me176c-scrapegsma-2554.json
index 6a82260ec660b..f375de9711ebd 100644
--- a/data/tablet/asus/2014/memo-pad-7-me176c/asus-memo-pad-7-me176c-scrapegsma-2554.json
+++ b/data/tablet/asus/2014/memo-pad-7-me176c/asus-memo-pad-7-me176c-scrapegsma-2554.json
@@ -35,7 +35,7 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-7-me572c/asus-memo-pad-7-me572c-scrapegsma-2549.json b/data/tablet/asus/2014/memo-pad-7-me572c/asus-memo-pad-7-me572c-scrapegsma-2549.json
index a7f0e49e7257e..f5c7cd47106dc 100644
--- a/data/tablet/asus/2014/memo-pad-7-me572c/asus-memo-pad-7-me572c-scrapegsma-2549.json
+++ b/data/tablet/asus/2014/memo-pad-7-me572c/asus-memo-pad-7-me572c-scrapegsma-2549.json
@@ -35,7 +35,7 @@
     "ppi": 323
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-7-me572cl/asus-memo-pad-7-me572cl-scrapegsma-2548.json b/data/tablet/asus/2014/memo-pad-7-me572cl/asus-memo-pad-7-me572cl-scrapegsma-2548.json
index 6ad3d3a2173d0..7e25d5f292692 100644
--- a/data/tablet/asus/2014/memo-pad-7-me572cl/asus-memo-pad-7-me572cl-scrapegsma-2548.json
+++ b/data/tablet/asus/2014/memo-pad-7-me572cl/asus-memo-pad-7-me572cl-scrapegsma-2548.json
@@ -38,7 +38,7 @@
     "ppi": 323
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-8-me181c/asus-memo-pad-8-me181c-scrapegsma-2553.json b/data/tablet/asus/2014/memo-pad-8-me181c/asus-memo-pad-8-me181c-scrapegsma-2553.json
index 96a391211e70e..f02a4dba452aa 100644
--- a/data/tablet/asus/2014/memo-pad-8-me181c/asus-memo-pad-8-me181c-scrapegsma-2553.json
+++ b/data/tablet/asus/2014/memo-pad-8-me181c/asus-memo-pad-8-me181c-scrapegsma-2553.json
@@ -35,7 +35,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/memo-pad-8-me581cl/asus-memo-pad-8-me581cl-scrapegsma-2552.json b/data/tablet/asus/2014/memo-pad-8-me581cl/asus-memo-pad-8-me581cl-scrapegsma-2552.json
index b17cf627c6176..b09edf09643ec 100644
--- a/data/tablet/asus/2014/memo-pad-8-me581cl/asus-memo-pad-8-me581cl-scrapegsma-2552.json
+++ b/data/tablet/asus/2014/memo-pad-8-me581cl/asus-memo-pad-8-me581cl-scrapegsma-2552.json
@@ -38,7 +38,7 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-infinity-lite/asus-padfone-infinity-lite-scrapegsma-2563.json b/data/tablet/asus/2014/padfone-infinity-lite/asus-padfone-infinity-lite-scrapegsma-2563.json
index f6f7c8b57242a..da4ccfd7a209f 100644
--- a/data/tablet/asus/2014/padfone-infinity-lite/asus-padfone-infinity-lite-scrapegsma-2563.json
+++ b/data/tablet/asus/2014/padfone-infinity-lite/asus-padfone-infinity-lite-scrapegsma-2563.json
@@ -38,7 +38,7 @@
     "ppi": 441
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-mini-4g-intel/asus-padfone-mini-4g-intel-scrapegsma-2570.json b/data/tablet/asus/2014/padfone-mini-4g-intel/asus-padfone-mini-4g-intel-scrapegsma-2570.json
index 75caf6fec9a6c..589984903bc0d 100644
--- a/data/tablet/asus/2014/padfone-mini-4g-intel/asus-padfone-mini-4g-intel-scrapegsma-2570.json
+++ b/data/tablet/asus/2014/padfone-mini-4g-intel/asus-padfone-mini-4g-intel-scrapegsma-2570.json
@@ -38,7 +38,6 @@
     "ppi": 218
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-mini-intel/asus-padfone-mini-intel-scrapegsma-2571.json b/data/tablet/asus/2014/padfone-mini-intel/asus-padfone-mini-intel-scrapegsma-2571.json
index a221947800500..ad901bd0d6332 100644
--- a/data/tablet/asus/2014/padfone-mini-intel/asus-padfone-mini-intel-scrapegsma-2571.json
+++ b/data/tablet/asus/2014/padfone-mini-intel/asus-padfone-mini-intel-scrapegsma-2571.json
@@ -38,7 +38,6 @@
     "ppi": 233
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-s/asus-padfone-s-scrapegsma-2562.json b/data/tablet/asus/2014/padfone-s/asus-padfone-s-scrapegsma-2562.json
index 29a883a4a8aca..d23116f69cfd8 100644
--- a/data/tablet/asus/2014/padfone-s/asus-padfone-s-scrapegsma-2562.json
+++ b/data/tablet/asus/2014/padfone-s/asus-padfone-s-scrapegsma-2562.json
@@ -41,7 +41,6 @@
     "ppi": 441
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-x-mini/asus-padfone-x-mini-scrapegsma-2547.json b/data/tablet/asus/2014/padfone-x-mini/asus-padfone-x-mini-scrapegsma-2547.json
index 92b8ce61f860b..bbd04456d2137 100644
--- a/data/tablet/asus/2014/padfone-x-mini/asus-padfone-x-mini-scrapegsma-2547.json
+++ b/data/tablet/asus/2014/padfone-x-mini/asus-padfone-x-mini-scrapegsma-2547.json
@@ -38,7 +38,6 @@
     "ppi": 218
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/padfone-x/asus-padfone-x-scrapegsma-2561.json b/data/tablet/asus/2014/padfone-x/asus-padfone-x-scrapegsma-2561.json
index b1f3e89ef21e5..75e001bb7b9fe 100644
--- a/data/tablet/asus/2014/padfone-x/asus-padfone-x-scrapegsma-2561.json
+++ b/data/tablet/asus/2014/padfone-x/asus-padfone-x-scrapegsma-2561.json
@@ -38,7 +38,6 @@
     "ppi": 441
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/transformer-pad-tf103c/asus-transformer-pad-tf103c-scrapegsma-2559.json b/data/tablet/asus/2014/transformer-pad-tf103c/asus-transformer-pad-tf103c-scrapegsma-2559.json
index 5e9fe1fc8604a..5809b89dcfe8d 100644
--- a/data/tablet/asus/2014/transformer-pad-tf103c/asus-transformer-pad-tf103c-scrapegsma-2559.json
+++ b/data/tablet/asus/2014/transformer-pad-tf103c/asus-transformer-pad-tf103c-scrapegsma-2559.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/asus/2014/transformer-pad-tf303cl/asus-transformer-pad-tf303cl-scrapegsma-2558.json b/data/tablet/asus/2014/transformer-pad-tf303cl/asus-transformer-pad-tf303cl-scrapegsma-2558.json
index 2a4fb595b09f0..15129f7162f8e 100644
--- a/data/tablet/asus/2014/transformer-pad-tf303cl/asus-transformer-pad-tf303cl-scrapegsma-2558.json
+++ b/data/tablet/asus/2014/transformer-pad-tf303cl/asus-transformer-pad-tf303cl-scrapegsma-2558.json
@@ -38,7 +38,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/blackberry/2010/playbook-wimax/blackberry-playbook-wimax-scrapegsma-2785.json b/data/tablet/blackberry/2010/playbook-wimax/blackberry-playbook-wimax-scrapegsma-2785.json
index 336b726db9256..d74b862bb92e0 100644
--- a/data/tablet/blackberry/2010/playbook-wimax/blackberry-playbook-wimax-scrapegsma-2785.json
+++ b/data/tablet/blackberry/2010/playbook-wimax/blackberry-playbook-wimax-scrapegsma-2785.json
@@ -35,7 +35,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/blackberry/2010/playbook/blackberry-playbook-scrapegsma-2786.json b/data/tablet/blackberry/2010/playbook/blackberry-playbook-scrapegsma-2786.json
index be7a1644f3e9b..ba1b8a256df01 100644
--- a/data/tablet/blackberry/2010/playbook/blackberry-playbook-scrapegsma-2786.json
+++ b/data/tablet/blackberry/2010/playbook/blackberry-playbook-scrapegsma-2786.json
@@ -36,7 +36,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/blackberry/2011/4g-playbook-hspa/blackberry-4g-playbook-hspa-scrapegsma-2784.json b/data/tablet/blackberry/2011/4g-playbook-hspa/blackberry-4g-playbook-hspa-scrapegsma-2784.json
index d77d8c04b919a..d69734c3fa84f 100644
--- a/data/tablet/blackberry/2011/4g-playbook-hspa/blackberry-4g-playbook-hspa-scrapegsma-2784.json
+++ b/data/tablet/blackberry/2011/4g-playbook-hspa/blackberry-4g-playbook-hspa-scrapegsma-2784.json
@@ -38,7 +38,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/blu/2014/life-view-tab/blu-life-view-tab-scrapegsma-3024.json b/data/tablet/blu/2014/life-view-tab/blu-life-view-tab-scrapegsma-3024.json
index 9c6688f023d3e..5f343aa5472cf 100644
--- a/data/tablet/blu/2014/life-view-tab/blu-life-view-tab-scrapegsma-3024.json
+++ b/data/tablet/blu/2014/life-view-tab/blu-life-view-tab-scrapegsma-3024.json
@@ -38,7 +38,6 @@
     "ppi": 160
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/honor/2016/pad-2/honor-pad-2-scrapegsma-3759.json b/data/tablet/honor/2016/pad-2/honor-pad-2-scrapegsma-3759.json
index b79de97a69160..bbafe9e6d6942 100644
--- a/data/tablet/honor/2016/pad-2/honor-pad-2-scrapegsma-3759.json
+++ b/data/tablet/honor/2016/pad-2/honor-pad-2-scrapegsma-3759.json
@@ -38,7 +38,7 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/hp/2011/touchpad-4g/hp-touchpad-4g-scrapegsma-3802.json b/data/tablet/hp/2011/touchpad-4g/hp-touchpad-4g-scrapegsma-3802.json
index 802c58f09f471..1c51c26dce753 100644
--- a/data/tablet/hp/2011/touchpad-4g/hp-touchpad-4g-scrapegsma-3802.json
+++ b/data/tablet/hp/2011/touchpad-4g/hp-touchpad-4g-scrapegsma-3802.json
@@ -38,7 +38,6 @@
     "ppi": 132
   },
   "storage_options_gb": [
-    1,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/hp/2011/touchpad/hp-touchpad-scrapegsma-3807.json b/data/tablet/hp/2011/touchpad/hp-touchpad-scrapegsma-3807.json
index e6d187f381630..e946e7370fc48 100644
--- a/data/tablet/hp/2011/touchpad/hp-touchpad-scrapegsma-3807.json
+++ b/data/tablet/hp/2011/touchpad/hp-touchpad-scrapegsma-3807.json
@@ -36,7 +36,7 @@
     "ppi": 132
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/hp/2015/pro-slate-10-ee-g1/hp-pro-slate-10-ee-g1-scrapegsma-3788.json b/data/tablet/hp/2015/pro-slate-10-ee-g1/hp-pro-slate-10-ee-g1-scrapegsma-3788.json
index eb2c7a6513008..1d9586799cc72 100644
--- a/data/tablet/hp/2015/pro-slate-10-ee-g1/hp-pro-slate-10-ee-g1-scrapegsma-3788.json
+++ b/data/tablet/hp/2015/pro-slate-10-ee-g1/hp-pro-slate-10-ee-g1-scrapegsma-3788.json
@@ -35,7 +35,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/hp/2015/pro-slate-8/hp-pro-slate-8-scrapegsma-3789.json b/data/tablet/hp/2015/pro-slate-8/hp-pro-slate-8-scrapegsma-3789.json
index 5880cba1018c0..6553ecb3c942b 100644
--- a/data/tablet/hp/2015/pro-slate-8/hp-pro-slate-8-scrapegsma-3789.json
+++ b/data/tablet/hp/2015/pro-slate-8/hp-pro-slate-8-scrapegsma-3789.json
@@ -38,7 +38,7 @@
     "ppi": 326
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2011/mediapad-s7-301w/huawei-mediapad-s7-301w-scrapegsma-4288.json b/data/tablet/huawei/2011/mediapad-s7-301w/huawei-mediapad-s7-301w-scrapegsma-4288.json
index efb1da0c9c72d..dd89d03e4d03e 100644
--- a/data/tablet/huawei/2011/mediapad-s7-301w/huawei-mediapad-s7-301w-scrapegsma-4288.json
+++ b/data/tablet/huawei/2011/mediapad-s7-301w/huawei-mediapad-s7-301w-scrapegsma-4288.json
@@ -35,7 +35,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2011/mediapad/huawei-mediapad-scrapegsma-4287.json b/data/tablet/huawei/2011/mediapad/huawei-mediapad-scrapegsma-4287.json
index 4999011dd9f75..b2dbc3fb54625 100644
--- a/data/tablet/huawei/2011/mediapad/huawei-mediapad-scrapegsma-4287.json
+++ b/data/tablet/huawei/2011/mediapad/huawei-mediapad-scrapegsma-4287.json
@@ -43,7 +43,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2012/mediapad-10-fhd/huawei-mediapad-10-fhd-scrapegsma-4278.json b/data/tablet/huawei/2012/mediapad-10-fhd/huawei-mediapad-10-fhd-scrapegsma-4278.json
index 3b1e3a9d57086..5b022dbd78266 100644
--- a/data/tablet/huawei/2012/mediapad-10-fhd/huawei-mediapad-10-fhd-scrapegsma-4278.json
+++ b/data/tablet/huawei/2012/mediapad-10-fhd/huawei-mediapad-10-fhd-scrapegsma-4278.json
@@ -38,7 +38,9 @@
     "ppi": 226
   },
   "storage_options_gb": [
-    2,
+    8,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2012/mediapad-7-lite/huawei-mediapad-7-lite-scrapegsma-4262.json b/data/tablet/huawei/2012/mediapad-7-lite/huawei-mediapad-7-lite-scrapegsma-4262.json
index 65076daeae7e9..22151ecefd31a 100644
--- a/data/tablet/huawei/2012/mediapad-7-lite/huawei-mediapad-7-lite-scrapegsma-4262.json
+++ b/data/tablet/huawei/2012/mediapad-7-lite/huawei-mediapad-7-lite-scrapegsma-4262.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2013/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4255.json b/data/tablet/huawei/2013/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4255.json
index 00bc79bc189ac..7fa52a32fbad6 100644
--- a/data/tablet/huawei/2013/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4255.json
+++ b/data/tablet/huawei/2013/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4255.json
@@ -38,7 +38,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2013/mediapad-7-vogue/huawei-mediapad-7-vogue-scrapegsma-4239.json b/data/tablet/huawei/2013/mediapad-7-vogue/huawei-mediapad-7-vogue-scrapegsma-4239.json
index efd15f0a04ae9..f7ccb137a2393 100644
--- a/data/tablet/huawei/2013/mediapad-7-vogue/huawei-mediapad-7-vogue-scrapegsma-4239.json
+++ b/data/tablet/huawei/2013/mediapad-7-vogue/huawei-mediapad-7-vogue-scrapegsma-4239.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-1002.json b/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-1002.json
index d696030cafe07..cea61a33ad4f2 100644
--- a/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-1002.json
+++ b/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-1002.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-119.json b/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-119.json
index 14ccf2cf936e0..84d1dd2fcc191 100644
--- a/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-119.json
+++ b/data/tablet/huawei/2013/mediapad-7-youth/huawei-mediapad-7-youth-scrapegsma-119.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2014/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4219.json b/data/tablet/huawei/2014/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4219.json
index 64ebc2d4bf767..300c2a02e7583 100644
--- a/data/tablet/huawei/2014/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4219.json
+++ b/data/tablet/huawei/2014/mediapad-10-link/huawei-mediapad-10-link-scrapegsma-4219.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2014/mediapad-7-youth2/huawei-mediapad-7-youth2-scrapegsma-4225.json b/data/tablet/huawei/2014/mediapad-7-youth2/huawei-mediapad-7-youth2-scrapegsma-4225.json
index 7634f836731db..129a2e394c553 100644
--- a/data/tablet/huawei/2014/mediapad-7-youth2/huawei-mediapad-7-youth2-scrapegsma-4225.json
+++ b/data/tablet/huawei/2014/mediapad-7-youth2/huawei-mediapad-7-youth2-scrapegsma-4225.json
@@ -38,7 +38,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    4,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2014/mediapad-m1/huawei-mediapad-m1-scrapegsma-4222.json b/data/tablet/huawei/2014/mediapad-m1/huawei-mediapad-m1-scrapegsma-4222.json
index bd39ebf91a3b5..46d54bb43458d 100644
--- a/data/tablet/huawei/2014/mediapad-m1/huawei-mediapad-m1-scrapegsma-4222.json
+++ b/data/tablet/huawei/2014/mediapad-m1/huawei-mediapad-m1-scrapegsma-4222.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2014/mediapad-t1-8-0/huawei-mediapad-t1-8-0-scrapegsma-4204.json b/data/tablet/huawei/2014/mediapad-t1-8-0/huawei-mediapad-t1-8-0-scrapegsma-4204.json
index d50305dc7275a..f4f7284e47540 100644
--- a/data/tablet/huawei/2014/mediapad-t1-8-0/huawei-mediapad-t1-8-0-scrapegsma-4204.json
+++ b/data/tablet/huawei/2014/mediapad-t1-8-0/huawei-mediapad-t1-8-0-scrapegsma-4204.json
@@ -38,7 +38,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2014/mediapad-x1/huawei-mediapad-x1-scrapegsma-4223.json b/data/tablet/huawei/2014/mediapad-x1/huawei-mediapad-x1-scrapegsma-4223.json
index f7e1650bc3714..cc1102c58dffd 100644
--- a/data/tablet/huawei/2014/mediapad-x1/huawei-mediapad-x1-scrapegsma-4223.json
+++ b/data/tablet/huawei/2014/mediapad-x1/huawei-mediapad-x1-scrapegsma-4223.json
@@ -42,7 +42,6 @@
     "ppi": 323
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2015/mediapad-t1-10/huawei-mediapad-t1-10-scrapegsma-4203.json b/data/tablet/huawei/2015/mediapad-t1-10/huawei-mediapad-t1-10-scrapegsma-4203.json
index 9957bbcd127a7..ef9ef58429fc5 100644
--- a/data/tablet/huawei/2015/mediapad-t1-10/huawei-mediapad-t1-10-scrapegsma-4203.json
+++ b/data/tablet/huawei/2015/mediapad-t1-10/huawei-mediapad-t1-10-scrapegsma-4203.json
@@ -38,7 +38,6 @@
     "ppi": 157
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2016/mediapad-m2-7-0/huawei-mediapad-m2-7-0-scrapegsma-4170.json b/data/tablet/huawei/2016/mediapad-m2-7-0/huawei-mediapad-m2-7-0-scrapegsma-4170.json
index 214d4bf50eb86..8eaa2ec96d8d6 100644
--- a/data/tablet/huawei/2016/mediapad-m2-7-0/huawei-mediapad-m2-7-0-scrapegsma-4170.json
+++ b/data/tablet/huawei/2016/mediapad-m2-7-0/huawei-mediapad-m2-7-0-scrapegsma-4170.json
@@ -38,7 +38,7 @@
     "ppi": 323
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2016/mediapad-m3-8-4/huawei-mediapad-m3-8-4-scrapegsma-4162.json b/data/tablet/huawei/2016/mediapad-m3-8-4/huawei-mediapad-m3-8-4-scrapegsma-4162.json
index 8b6a992ae3355..9495c2937106c 100644
--- a/data/tablet/huawei/2016/mediapad-m3-8-4/huawei-mediapad-m3-8-4-scrapegsma-4162.json
+++ b/data/tablet/huawei/2016/mediapad-m3-8-4/huawei-mediapad-m3-8-4-scrapegsma-4162.json
@@ -42,7 +42,7 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    4,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2016/mediapad-t1-7-0-plus/huawei-mediapad-t1-7-0-plus-scrapegsma-4169.json b/data/tablet/huawei/2016/mediapad-t1-7-0-plus/huawei-mediapad-t1-7-0-plus-scrapegsma-4169.json
index 08d0e69e2dabd..cf00443092b82 100644
--- a/data/tablet/huawei/2016/mediapad-t1-7-0-plus/huawei-mediapad-t1-7-0-plus-scrapegsma-4169.json
+++ b/data/tablet/huawei/2016/mediapad-t1-7-0-plus/huawei-mediapad-t1-7-0-plus-scrapegsma-4169.json
@@ -41,7 +41,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2016/mediapad-t2-10-0-pro/huawei-mediapad-t2-10-0-pro-scrapegsma-4165.json b/data/tablet/huawei/2016/mediapad-t2-10-0-pro/huawei-mediapad-t2-10-0-pro-scrapegsma-4165.json
index 99062879a7b07..b97b2a5fc693c 100644
--- a/data/tablet/huawei/2016/mediapad-t2-10-0-pro/huawei-mediapad-t2-10-0-pro-scrapegsma-4165.json
+++ b/data/tablet/huawei/2016/mediapad-t2-10-0-pro/huawei-mediapad-t2-10-0-pro-scrapegsma-4165.json
@@ -43,8 +43,6 @@
     "ppi": 226
   },
   "storage_options_gb": [
-    2,
-    3,
     16,
     32
   ],
diff --git a/data/tablet/huawei/2016/mediapad-t2-7-0/huawei-mediapad-t2-7-0-scrapegsma-4167.json b/data/tablet/huawei/2016/mediapad-t2-7-0/huawei-mediapad-t2-7-0-scrapegsma-4167.json
index 6b7dd6e91bb95..282f5b2a5513e 100644
--- a/data/tablet/huawei/2016/mediapad-t2-7-0/huawei-mediapad-t2-7-0-scrapegsma-4167.json
+++ b/data/tablet/huawei/2016/mediapad-t2-7-0/huawei-mediapad-t2-7-0-scrapegsma-4167.json
@@ -42,8 +42,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2017/mediapad-m3-lite-10/huawei-mediapad-m3-lite-10-scrapegsma-4140.json b/data/tablet/huawei/2017/mediapad-m3-lite-10/huawei-mediapad-m3-lite-10-scrapegsma-4140.json
index b112760c5483f..ffa4af3d37def 100644
--- a/data/tablet/huawei/2017/mediapad-m3-lite-10/huawei-mediapad-m3-lite-10-scrapegsma-4140.json
+++ b/data/tablet/huawei/2017/mediapad-m3-lite-10/huawei-mediapad-m3-lite-10-scrapegsma-4140.json
@@ -42,9 +42,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    3,
-    4,
-    32,
+    16,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2017/mediapad-m3-lite-8/huawei-mediapad-m3-lite-8-scrapegsma-4138.json b/data/tablet/huawei/2017/mediapad-m3-lite-8/huawei-mediapad-m3-lite-8-scrapegsma-4138.json
index 68eeed57b87d0..7c5a4bab259c8 100644
--- a/data/tablet/huawei/2017/mediapad-m3-lite-8/huawei-mediapad-m3-lite-8-scrapegsma-4138.json
+++ b/data/tablet/huawei/2017/mediapad-m3-lite-8/huawei-mediapad-m3-lite-8-scrapegsma-4138.json
@@ -43,9 +43,7 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    3,
-    4,
-    32,
+    16,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2018/mediapad-m5-10-pro/huawei-mediapad-m5-10-pro-scrapegsma-4126.json b/data/tablet/huawei/2018/mediapad-m5-10-pro/huawei-mediapad-m5-10-pro-scrapegsma-4126.json
index 8ca4a2673c0fa..95eca28547b4f 100644
--- a/data/tablet/huawei/2018/mediapad-m5-10-pro/huawei-mediapad-m5-10-pro-scrapegsma-4126.json
+++ b/data/tablet/huawei/2018/mediapad-m5-10-pro/huawei-mediapad-m5-10-pro-scrapegsma-4126.json
@@ -42,7 +42,7 @@
     "ppi": 280
   },
   "storage_options_gb": [
-    4,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2018/mediapad-m5-10/huawei-mediapad-m5-10-scrapegsma-4127.json b/data/tablet/huawei/2018/mediapad-m5-10/huawei-mediapad-m5-10-scrapegsma-4127.json
index a23bd8b143422..a173f33bba55c 100644
--- a/data/tablet/huawei/2018/mediapad-m5-10/huawei-mediapad-m5-10-scrapegsma-4127.json
+++ b/data/tablet/huawei/2018/mediapad-m5-10/huawei-mediapad-m5-10-scrapegsma-4127.json
@@ -42,7 +42,8 @@
     "ppi": 280
   },
   "storage_options_gb": [
-    4,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2018/mediapad-m5-8/huawei-mediapad-m5-8-scrapegsma-4128.json b/data/tablet/huawei/2018/mediapad-m5-8/huawei-mediapad-m5-8-scrapegsma-4128.json
index 68246c6a0dd06..f07c927015a95 100644
--- a/data/tablet/huawei/2018/mediapad-m5-8/huawei-mediapad-m5-8-scrapegsma-4128.json
+++ b/data/tablet/huawei/2018/mediapad-m5-8/huawei-mediapad-m5-8-scrapegsma-4128.json
@@ -42,7 +42,8 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    4,
+    32,
+    64,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-108.json b/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-108.json
index e2383b3c8a1fc..03a2d4f9c88e7 100644
--- a/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-108.json
+++ b/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-108.json
@@ -42,7 +42,6 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    6,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-991.json b/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-991.json
index e141597dc5c3c..0d881759581d7 100644
--- a/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-991.json
+++ b/data/tablet/huawei/2019/mediapad-m6-turbo-8-4/huawei-mediapad-m6-turbo-8-4-scrapegsma-991.json
@@ -42,7 +42,6 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    6,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/jolla/2014/tablet/jolla-tablet-scrapegsma-4526.json b/data/tablet/jolla/2014/tablet/jolla-tablet-scrapegsma-4526.json
index 184bc69b5b0de..8c085197a61e6 100644
--- a/data/tablet/jolla/2014/tablet/jolla-tablet-scrapegsma-4526.json
+++ b/data/tablet/jolla/2014/tablet/jolla-tablet-scrapegsma-4526.json
@@ -35,7 +35,7 @@
     "ppi": 326
   },
   "storage_options_gb": [
-    2,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2013/yoga-tablet-10/lenovo-yoga-tablet-10-scrapegsma-4866.json b/data/tablet/lenovo/2013/yoga-tablet-10/lenovo-yoga-tablet-10-scrapegsma-4866.json
index f906bc2b3e5f6..2a3fd83c1a83c 100644
--- a/data/tablet/lenovo/2013/yoga-tablet-10/lenovo-yoga-tablet-10-scrapegsma-4866.json
+++ b/data/tablet/lenovo/2013/yoga-tablet-10/lenovo-yoga-tablet-10-scrapegsma-4866.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2013/yoga-tablet-8/lenovo-yoga-tablet-8-scrapegsma-4867.json b/data/tablet/lenovo/2013/yoga-tablet-8/lenovo-yoga-tablet-8-scrapegsma-4867.json
index f87016bc75bd1..d6371b17331c4 100644
--- a/data/tablet/lenovo/2013/yoga-tablet-8/lenovo-yoga-tablet-8-scrapegsma-4867.json
+++ b/data/tablet/lenovo/2013/yoga-tablet-8/lenovo-yoga-tablet-8-scrapegsma-4867.json
@@ -38,7 +38,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2014/tab-s8/lenovo-tab-s8-scrapegsma-4838.json b/data/tablet/lenovo/2014/tab-s8/lenovo-tab-s8-scrapegsma-4838.json
index 85b5abd10ff82..68a705899ba92 100644
--- a/data/tablet/lenovo/2014/tab-s8/lenovo-tab-s8-scrapegsma-4838.json
+++ b/data/tablet/lenovo/2014/tab-s8/lenovo-tab-s8-scrapegsma-4838.json
@@ -38,7 +38,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2014/yoga-tablet-10-hd/lenovo-yoga-tablet-10-hd-scrapegsma-4857.json b/data/tablet/lenovo/2014/yoga-tablet-10-hd/lenovo-yoga-tablet-10-hd-scrapegsma-4857.json
index 7b24b9989ea06..205da5219bb2e 100644
--- a/data/tablet/lenovo/2014/yoga-tablet-10-hd/lenovo-yoga-tablet-10-hd-scrapegsma-4857.json
+++ b/data/tablet/lenovo/2014/yoga-tablet-10-hd/lenovo-yoga-tablet-10-hd-scrapegsma-4857.json
@@ -38,7 +38,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2014/yoga-tablet-2-10-1/lenovo-yoga-tablet-2-10-1-scrapegsma-4836.json b/data/tablet/lenovo/2014/yoga-tablet-2-10-1/lenovo-yoga-tablet-2-10-1-scrapegsma-4836.json
index 9ba3de03bafb8..a6d2388c4c6f5 100644
--- a/data/tablet/lenovo/2014/yoga-tablet-2-10-1/lenovo-yoga-tablet-2-10-1-scrapegsma-4836.json
+++ b/data/tablet/lenovo/2014/yoga-tablet-2-10-1/lenovo-yoga-tablet-2-10-1-scrapegsma-4836.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2014/yoga-tablet-2-8-0/lenovo-yoga-tablet-2-8-0-scrapegsma-4837.json b/data/tablet/lenovo/2014/yoga-tablet-2-8-0/lenovo-yoga-tablet-2-8-0-scrapegsma-4837.json
index d5e9b60e29e67..47a4b726eb395 100644
--- a/data/tablet/lenovo/2014/yoga-tablet-2-8-0/lenovo-yoga-tablet-2-8-0-scrapegsma-4837.json
+++ b/data/tablet/lenovo/2014/yoga-tablet-2-8-0/lenovo-yoga-tablet-2-8-0-scrapegsma-4837.json
@@ -38,7 +38,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2014/yoga-tablet-2-pro/lenovo-yoga-tablet-2-pro-scrapegsma-4835.json b/data/tablet/lenovo/2014/yoga-tablet-2-pro/lenovo-yoga-tablet-2-pro-scrapegsma-4835.json
index d1eb6286763c5..1b96eae995c0c 100644
--- a/data/tablet/lenovo/2014/yoga-tablet-2-pro/lenovo-yoga-tablet-2-pro-scrapegsma-4835.json
+++ b/data/tablet/lenovo/2014/yoga-tablet-2-pro/lenovo-yoga-tablet-2-pro-scrapegsma-4835.json
@@ -38,7 +38,6 @@
     "ppi": 221
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/tab-2-a10-70/lenovo-tab-2-a10-70-scrapegsma-4818.json b/data/tablet/lenovo/2015/tab-2-a10-70/lenovo-tab-2-a10-70-scrapegsma-4818.json
index 127984c3e85ff..c9bf56001e9f1 100644
--- a/data/tablet/lenovo/2015/tab-2-a10-70/lenovo-tab-2-a10-70-scrapegsma-4818.json
+++ b/data/tablet/lenovo/2015/tab-2-a10-70/lenovo-tab-2-a10-70-scrapegsma-4818.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/tab-2-a7-10/lenovo-tab-2-a7-10-scrapegsma-4823.json b/data/tablet/lenovo/2015/tab-2-a7-10/lenovo-tab-2-a7-10-scrapegsma-4823.json
index b252395c69c44..670bfd4562c90 100644
--- a/data/tablet/lenovo/2015/tab-2-a7-10/lenovo-tab-2-a7-10-scrapegsma-4823.json
+++ b/data/tablet/lenovo/2015/tab-2-a7-10/lenovo-tab-2-a7-10-scrapegsma-4823.json
@@ -35,7 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/tab-2-a7-20/lenovo-tab-2-a7-20-scrapegsma-4822.json b/data/tablet/lenovo/2015/tab-2-a7-20/lenovo-tab-2-a7-20-scrapegsma-4822.json
index e1a7010efaf87..87a8df85073b7 100644
--- a/data/tablet/lenovo/2015/tab-2-a7-20/lenovo-tab-2-a7-20-scrapegsma-4822.json
+++ b/data/tablet/lenovo/2015/tab-2-a7-20/lenovo-tab-2-a7-20-scrapegsma-4822.json
@@ -35,7 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/tab-2-a7-30/lenovo-tab-2-a7-30-scrapegsma-4821.json b/data/tablet/lenovo/2015/tab-2-a7-30/lenovo-tab-2-a7-30-scrapegsma-4821.json
index de0023f29b737..2bd9d685bfe36 100644
--- a/data/tablet/lenovo/2015/tab-2-a7-30/lenovo-tab-2-a7-30-scrapegsma-4821.json
+++ b/data/tablet/lenovo/2015/tab-2-a7-30/lenovo-tab-2-a7-30-scrapegsma-4821.json
@@ -41,7 +41,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/tab-2-a8-50/lenovo-tab-2-a8-50-scrapegsma-4819.json b/data/tablet/lenovo/2015/tab-2-a8-50/lenovo-tab-2-a8-50-scrapegsma-4819.json
index 7d650ae3a5749..c00fc794b9521 100644
--- a/data/tablet/lenovo/2015/tab-2-a8-50/lenovo-tab-2-a8-50-scrapegsma-4819.json
+++ b/data/tablet/lenovo/2015/tab-2-a8-50/lenovo-tab-2-a8-50-scrapegsma-4819.json
@@ -38,7 +38,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/yoga-tab-3-8-0/lenovo-yoga-tab-3-8-0-scrapegsma-4796.json b/data/tablet/lenovo/2015/yoga-tab-3-8-0/lenovo-yoga-tab-3-8-0-scrapegsma-4796.json
index 41b41aeedf415..7707ecaf570ef 100644
--- a/data/tablet/lenovo/2015/yoga-tab-3-8-0/lenovo-yoga-tab-3-8-0-scrapegsma-4796.json
+++ b/data/tablet/lenovo/2015/yoga-tab-3-8-0/lenovo-yoga-tab-3-8-0-scrapegsma-4796.json
@@ -35,7 +35,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2015/yoga-tab-3-pro/lenovo-yoga-tab-3-pro-scrapegsma-4795.json b/data/tablet/lenovo/2015/yoga-tab-3-pro/lenovo-yoga-tab-3-pro-scrapegsma-4795.json
index 4076c74986084..3d99b75ebeec4 100644
--- a/data/tablet/lenovo/2015/yoga-tab-3-pro/lenovo-yoga-tab-3-pro-scrapegsma-4795.json
+++ b/data/tablet/lenovo/2015/yoga-tab-3-pro/lenovo-yoga-tab-3-pro-scrapegsma-4795.json
@@ -39,7 +39,6 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-1054.json b/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-1054.json
index 8e1cd2e1ba699..a3d4a8b888fe1 100644
--- a/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-1054.json
+++ b/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-1054.json
@@ -41,7 +41,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-171.json b/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-171.json
index 85d5f5710adc9..ffbff56992e2c 100644
--- a/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-171.json
+++ b/data/tablet/lenovo/2016/yoga-tab-3-10/lenovo-yoga-tab-3-10-scrapegsma-171.json
@@ -41,7 +41,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2016/yoga-tab-3-plus/lenovo-yoga-tab-3-plus-scrapegsma-4771.json b/data/tablet/lenovo/2016/yoga-tab-3-plus/lenovo-yoga-tab-3-plus-scrapegsma-4771.json
index 1b3b3e5e1ae02..62c0b3e1781f1 100644
--- a/data/tablet/lenovo/2016/yoga-tab-3-plus/lenovo-yoga-tab-3-plus-scrapegsma-4771.json
+++ b/data/tablet/lenovo/2016/yoga-tab-3-plus/lenovo-yoga-tab-3-plus-scrapegsma-4771.json
@@ -38,7 +38,6 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2017/moto-tab/lenovo-moto-tab-scrapegsma-4751.json b/data/tablet/lenovo/2017/moto-tab/lenovo-moto-tab-scrapegsma-4751.json
index be2511871b8c1..7d8364e2712b1 100644
--- a/data/tablet/lenovo/2017/moto-tab/lenovo-moto-tab-scrapegsma-4751.json
+++ b/data/tablet/lenovo/2017/moto-tab/lenovo-moto-tab-scrapegsma-4751.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2017/tab-4-10/lenovo-tab-4-10-scrapegsma-4758.json b/data/tablet/lenovo/2017/tab-4-10/lenovo-tab-4-10-scrapegsma-4758.json
index 87444afeeee23..990ae9148703b 100644
--- a/data/tablet/lenovo/2017/tab-4-10/lenovo-tab-4-10-scrapegsma-4758.json
+++ b/data/tablet/lenovo/2017/tab-4-10/lenovo-tab-4-10-scrapegsma-4758.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2017/tab-4-8/lenovo-tab-4-8-scrapegsma-4760.json b/data/tablet/lenovo/2017/tab-4-8/lenovo-tab-4-8-scrapegsma-4760.json
index 5102fb541d738..8f7205f7cabfe 100644
--- a/data/tablet/lenovo/2017/tab-4-8/lenovo-tab-4-8-scrapegsma-4760.json
+++ b/data/tablet/lenovo/2017/tab-4-8/lenovo-tab-4-8-scrapegsma-4760.json
@@ -38,7 +38,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2017/tab-7-essential/lenovo-tab-7-essential-scrapegsma-4752.json b/data/tablet/lenovo/2017/tab-7-essential/lenovo-tab-7-essential-scrapegsma-4752.json
index 643515dd00fde..18dd59af70e22 100644
--- a/data/tablet/lenovo/2017/tab-7-essential/lenovo-tab-7-essential-scrapegsma-4752.json
+++ b/data/tablet/lenovo/2017/tab-7-essential/lenovo-tab-7-essential-scrapegsma-4752.json
@@ -35,7 +35,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2017/tab-7/lenovo-tab-7-scrapegsma-4753.json b/data/tablet/lenovo/2017/tab-7/lenovo-tab-7-scrapegsma-4753.json
index 369d69158bc61..284be6905ba41 100644
--- a/data/tablet/lenovo/2017/tab-7/lenovo-tab-7-scrapegsma-4753.json
+++ b/data/tablet/lenovo/2017/tab-7/lenovo-tab-7-scrapegsma-4753.json
@@ -38,7 +38,6 @@
     "ppi": 210
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2019/tab-v7/lenovo-tab-v7-scrapegsma-4736.json b/data/tablet/lenovo/2019/tab-v7/lenovo-tab-v7-scrapegsma-4736.json
index f2d3a66f94217..9a39ab80b3292 100644
--- a/data/tablet/lenovo/2019/tab-v7/lenovo-tab-v7-scrapegsma-4736.json
+++ b/data/tablet/lenovo/2019/tab-v7/lenovo-tab-v7-scrapegsma-4736.json
@@ -38,7 +38,6 @@
     "ppi": 347
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-1043.json b/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-1043.json
index 14ffa7f594379..8824558b725d3 100644
--- a/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-1043.json
+++ b/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-1043.json
@@ -35,7 +35,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-160.json b/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-160.json
index 7723d8fb31bee..4f38698e701e1 100644
--- a/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-160.json
+++ b/data/tablet/lenovo/2019/yoga-smart-tab/lenovo-yoga-smart-tab-scrapegsma-160.json
@@ -35,7 +35,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2013/g-pad-8-3/lg-g-pad-8-3-scrapegsma-5079.json b/data/tablet/lg/2013/g-pad-8-3/lg-g-pad-8-3-scrapegsma-5079.json
index cf637c1c8ffb1..ea61fa347cc55 100644
--- a/data/tablet/lg/2013/g-pad-8-3/lg-g-pad-8-3-scrapegsma-5079.json
+++ b/data/tablet/lg/2013/g-pad-8-3/lg-g-pad-8-3-scrapegsma-5079.json
@@ -40,7 +40,6 @@
     "ppi": 273
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-10-1-lte/lg-g-pad-10-1-lte-scrapegsma-5047.json b/data/tablet/lg/2014/g-pad-10-1-lte/lg-g-pad-10-1-lte-scrapegsma-5047.json
index 262779829fccc..6cbe5c098207e 100644
--- a/data/tablet/lg/2014/g-pad-10-1-lte/lg-g-pad-10-1-lte-scrapegsma-5047.json
+++ b/data/tablet/lg/2014/g-pad-10-1-lte/lg-g-pad-10-1-lte-scrapegsma-5047.json
@@ -38,7 +38,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-10-1/lg-g-pad-10-1-scrapegsma-5048.json b/data/tablet/lg/2014/g-pad-10-1/lg-g-pad-10-1-scrapegsma-5048.json
index baef45bda3b11..a2018a4c1e7e1 100644
--- a/data/tablet/lg/2014/g-pad-10-1/lg-g-pad-10-1-scrapegsma-5048.json
+++ b/data/tablet/lg/2014/g-pad-10-1/lg-g-pad-10-1-scrapegsma-5048.json
@@ -36,7 +36,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-7-0-lte/lg-g-pad-7-0-lte-scrapegsma-5034.json b/data/tablet/lg/2014/g-pad-7-0-lte/lg-g-pad-7-0-lte-scrapegsma-5034.json
index 61d2d2a3f7b26..a13821adb18dc 100644
--- a/data/tablet/lg/2014/g-pad-7-0-lte/lg-g-pad-7-0-lte-scrapegsma-5034.json
+++ b/data/tablet/lg/2014/g-pad-7-0-lte/lg-g-pad-7-0-lte-scrapegsma-5034.json
@@ -38,7 +38,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-7-0/lg-g-pad-7-0-scrapegsma-5050.json b/data/tablet/lg/2014/g-pad-7-0/lg-g-pad-7-0-scrapegsma-5050.json
index a2f6d9614a0a7..18208090f4aaf 100644
--- a/data/tablet/lg/2014/g-pad-7-0/lg-g-pad-7-0-scrapegsma-5050.json
+++ b/data/tablet/lg/2014/g-pad-7-0/lg-g-pad-7-0-scrapegsma-5050.json
@@ -36,7 +36,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-8-0-lte/lg-g-pad-8-0-lte-scrapegsma-5031.json b/data/tablet/lg/2014/g-pad-8-0-lte/lg-g-pad-8-0-lte-scrapegsma-5031.json
index 923ddfe61c5c9..6f4cbb7223140 100644
--- a/data/tablet/lg/2014/g-pad-8-0-lte/lg-g-pad-8-0-lte-scrapegsma-5031.json
+++ b/data/tablet/lg/2014/g-pad-8-0-lte/lg-g-pad-8-0-lte-scrapegsma-5031.json
@@ -41,7 +41,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-8-0/lg-g-pad-8-0-scrapegsma-5049.json b/data/tablet/lg/2014/g-pad-8-0/lg-g-pad-8-0-scrapegsma-5049.json
index 0055295a77a1a..9d3fbd268c5f2 100644
--- a/data/tablet/lg/2014/g-pad-8-0/lg-g-pad-8-0-scrapegsma-5049.json
+++ b/data/tablet/lg/2014/g-pad-8-0/lg-g-pad-8-0-scrapegsma-5049.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2014/g-pad-8-3-lte/lg-g-pad-8-3-lte-scrapegsma-5055.json b/data/tablet/lg/2014/g-pad-8-3-lte/lg-g-pad-8-3-lte-scrapegsma-5055.json
index e7550578945ff..c5ebf726b7cc6 100644
--- a/data/tablet/lg/2014/g-pad-8-3-lte/lg-g-pad-8-3-lte-scrapegsma-5055.json
+++ b/data/tablet/lg/2014/g-pad-8-3-lte/lg-g-pad-8-3-lte-scrapegsma-5055.json
@@ -38,7 +38,6 @@
     "ppi": 273
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2015/g-pad-ii-10-1/lg-g-pad-ii-10-1-scrapegsma-5000.json b/data/tablet/lg/2015/g-pad-ii-10-1/lg-g-pad-ii-10-1-scrapegsma-5000.json
index cce38fdcce57e..22c7279dd8b81 100644
--- a/data/tablet/lg/2015/g-pad-ii-10-1/lg-g-pad-ii-10-1-scrapegsma-5000.json
+++ b/data/tablet/lg/2015/g-pad-ii-10-1/lg-g-pad-ii-10-1-scrapegsma-5000.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2015/g-pad-ii-8-0-lte/lg-g-pad-ii-8-0-lte-scrapegsma-5001.json b/data/tablet/lg/2015/g-pad-ii-8-0-lte/lg-g-pad-ii-8-0-lte-scrapegsma-5001.json
index 86dc23bdf6962..9a4e66379255a 100644
--- a/data/tablet/lg/2015/g-pad-ii-8-0-lte/lg-g-pad-ii-8-0-lte-scrapegsma-5001.json
+++ b/data/tablet/lg/2015/g-pad-ii-8-0-lte/lg-g-pad-ii-8-0-lte-scrapegsma-5001.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2015/g-pad-ii-8-3-lte/lg-g-pad-ii-8-3-lte-scrapegsma-4991.json b/data/tablet/lg/2015/g-pad-ii-8-3-lte/lg-g-pad-ii-8-3-lte-scrapegsma-4991.json
index 489e6d2db7ab0..4a26195ab7141 100644
--- a/data/tablet/lg/2015/g-pad-ii-8-3-lte/lg-g-pad-ii-8-3-lte-scrapegsma-4991.json
+++ b/data/tablet/lg/2015/g-pad-ii-8-3-lte/lg-g-pad-ii-8-3-lte-scrapegsma-4991.json
@@ -41,7 +41,6 @@
     "ppi": 273
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2016/g-pad-iii-10-1-fhd/lg-g-pad-iii-10-1-fhd-scrapegsma-4967.json b/data/tablet/lg/2016/g-pad-iii-10-1-fhd/lg-g-pad-iii-10-1-fhd-scrapegsma-4967.json
index 3ee2239a7b190..2b41bd8cc368f 100644
--- a/data/tablet/lg/2016/g-pad-iii-10-1-fhd/lg-g-pad-iii-10-1-fhd-scrapegsma-4967.json
+++ b/data/tablet/lg/2016/g-pad-iii-10-1-fhd/lg-g-pad-iii-10-1-fhd-scrapegsma-4967.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2016/g-pad-x-8-0/lg-g-pad-x-8-0-scrapegsma-4975.json b/data/tablet/lg/2016/g-pad-x-8-0/lg-g-pad-x-8-0-scrapegsma-4975.json
index e81b95a0ef9f2..e2cd10d5c2f77 100644
--- a/data/tablet/lg/2016/g-pad-x-8-0/lg-g-pad-x-8-0-scrapegsma-4975.json
+++ b/data/tablet/lg/2016/g-pad-x-8-0/lg-g-pad-x-8-0-scrapegsma-4975.json
@@ -42,7 +42,7 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2017/g-pad-iv-8-0-fhd/lg-g-pad-iv-8-0-fhd-scrapegsma-4952.json b/data/tablet/lg/2017/g-pad-iv-8-0-fhd/lg-g-pad-iv-8-0-fhd-scrapegsma-4952.json
index 8ec5bb210e458..42e31962a3d4e 100644
--- a/data/tablet/lg/2017/g-pad-iv-8-0-fhd/lg-g-pad-iv-8-0-fhd-scrapegsma-4952.json
+++ b/data/tablet/lg/2017/g-pad-iv-8-0-fhd/lg-g-pad-iv-8-0-fhd-scrapegsma-4952.json
@@ -44,7 +44,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-1066.json b/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-1066.json
index 62f2bd0435702..b7289e804e025 100644
--- a/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-1066.json
+++ b/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-1066.json
@@ -42,7 +42,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    4,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-183.json b/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-183.json
index 8f41d61aa1c86..2fe9fc52af089 100644
--- a/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-183.json
+++ b/data/tablet/lg/2019/g-pad-5-10-1/lg-g-pad-5-10-1-scrapegsma-183.json
@@ -42,7 +42,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    4,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/maxwest/2013/tab-phone-72dc/maxwest-tab-phone-72dc-scrapegsma-5537.json b/data/tablet/maxwest/2013/tab-phone-72dc/maxwest-tab-phone-72dc-scrapegsma-5537.json
index ca28f2edf7713..21f8e549249d5 100644
--- a/data/tablet/maxwest/2013/tab-phone-72dc/maxwest-tab-phone-72dc-scrapegsma-5537.json
+++ b/data/tablet/maxwest/2013/tab-phone-72dc/maxwest-tab-phone-72dc-scrapegsma-5537.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/micromax/2015/canvas-tab-p470/micromax-canvas-tab-p470-scrapegsma-5709.json b/data/tablet/micromax/2015/canvas-tab-p470/micromax-canvas-tab-p470-scrapegsma-5709.json
index 7088d4e0d1974..85d426b488bab 100644
--- a/data/tablet/micromax/2015/canvas-tab-p470/micromax-canvas-tab-p470-scrapegsma-5709.json
+++ b/data/tablet/micromax/2015/canvas-tab-p470/micromax-canvas-tab-p470-scrapegsma-5709.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/micromax/2015/canvas-tab-p666/micromax-canvas-tab-p666-scrapegsma-5708.json b/data/tablet/micromax/2015/canvas-tab-p666/micromax-canvas-tab-p666-scrapegsma-5708.json
index 5f613f0fdf941..1a0c8d196932e 100644
--- a/data/tablet/micromax/2015/canvas-tab-p666/micromax-canvas-tab-p666-scrapegsma-5708.json
+++ b/data/tablet/micromax/2015/canvas-tab-p666/micromax-canvas-tab-p666-scrapegsma-5708.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2010/p1000-galaxy-tab/samsung-p1000-galaxy-tab-scrapegsma-8403.json b/data/tablet/samsung/2010/p1000-galaxy-tab/samsung-p1000-galaxy-tab-scrapegsma-8403.json
index 5e40c98d2daf3..9511fe4528ca3 100644
--- a/data/tablet/samsung/2010/p1000-galaxy-tab/samsung-p1000-galaxy-tab-scrapegsma-8403.json
+++ b/data/tablet/samsung/2010/p1000-galaxy-tab/samsung-p1000-galaxy-tab-scrapegsma-8403.json
@@ -41,6 +41,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/galaxy-tab-10-1-lte-i905/samsung-galaxy-tab-10-1-lte-i905-scrapegsma-8345.json b/data/tablet/samsung/2011/galaxy-tab-10-1-lte-i905/samsung-galaxy-tab-10-1-lte-i905-scrapegsma-8345.json
index 7fea8d855e523..bf78a07a3e135 100644
--- a/data/tablet/samsung/2011/galaxy-tab-10-1-lte-i905/samsung-galaxy-tab-10-1-lte-i905-scrapegsma-8345.json
+++ b/data/tablet/samsung/2011/galaxy-tab-10-1-lte-i905/samsung-galaxy-tab-10-1-lte-i905-scrapegsma-8345.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/galaxy-tab-10-1-p7510/samsung-galaxy-tab-10-1-p7510-scrapegsma-8346.json b/data/tablet/samsung/2011/galaxy-tab-10-1-p7510/samsung-galaxy-tab-10-1-p7510-scrapegsma-8346.json
index 9cebf9e622a4d..7a15e6c2fdc72 100644
--- a/data/tablet/samsung/2011/galaxy-tab-10-1-p7510/samsung-galaxy-tab-10-1-p7510-scrapegsma-8346.json
+++ b/data/tablet/samsung/2011/galaxy-tab-10-1-p7510/samsung-galaxy-tab-10-1-p7510-scrapegsma-8346.json
@@ -35,7 +35,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/galaxy-tab-8-9-lte-i957/samsung-galaxy-tab-8-9-lte-i957-scrapegsma-8302.json b/data/tablet/samsung/2011/galaxy-tab-8-9-lte-i957/samsung-galaxy-tab-8-9-lte-i957-scrapegsma-8302.json
index 3da10ca8a805a..2e380338a71d1 100644
--- a/data/tablet/samsung/2011/galaxy-tab-8-9-lte-i957/samsung-galaxy-tab-8-9-lte-i957-scrapegsma-8302.json
+++ b/data/tablet/samsung/2011/galaxy-tab-8-9-lte-i957/samsung-galaxy-tab-8-9-lte-i957-scrapegsma-8302.json
@@ -38,7 +38,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/galaxy-tab-8-9-p7300/samsung-galaxy-tab-8-9-p7300-scrapegsma-8347.json b/data/tablet/samsung/2011/galaxy-tab-8-9-p7300/samsung-galaxy-tab-8-9-p7300-scrapegsma-8347.json
index 23a60431f4e7d..d001bb53807d6 100644
--- a/data/tablet/samsung/2011/galaxy-tab-8-9-p7300/samsung-galaxy-tab-8-9-p7300-scrapegsma-8347.json
+++ b/data/tablet/samsung/2011/galaxy-tab-8-9-p7300/samsung-galaxy-tab-8-9-p7300-scrapegsma-8347.json
@@ -38,7 +38,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/galaxy-tab-8-9-p7310/samsung-galaxy-tab-8-9-p7310-scrapegsma-8348.json b/data/tablet/samsung/2011/galaxy-tab-8-9-p7310/samsung-galaxy-tab-8-9-p7310-scrapegsma-8348.json
index e880c231685ed..0cecd896b7a8a 100644
--- a/data/tablet/samsung/2011/galaxy-tab-8-9-p7310/samsung-galaxy-tab-8-9-p7310-scrapegsma-8348.json
+++ b/data/tablet/samsung/2011/galaxy-tab-8-9-p7310/samsung-galaxy-tab-8-9-p7310-scrapegsma-8348.json
@@ -35,7 +35,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/p6200-galaxy-tab-7-0-plus/samsung-p6200-galaxy-tab-7-0-plus-scrapegsma-8286.json b/data/tablet/samsung/2011/p6200-galaxy-tab-7-0-plus/samsung-p6200-galaxy-tab-7-0-plus-scrapegsma-8286.json
index 9c423a9ed5f4a..e83c5993288c1 100644
--- a/data/tablet/samsung/2011/p6200-galaxy-tab-7-0-plus/samsung-p6200-galaxy-tab-7-0-plus-scrapegsma-8286.json
+++ b/data/tablet/samsung/2011/p6200-galaxy-tab-7-0-plus/samsung-p6200-galaxy-tab-7-0-plus-scrapegsma-8286.json
@@ -38,7 +38,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/p6210-galaxy-tab-7-0-plus/samsung-p6210-galaxy-tab-7-0-plus-scrapegsma-8285.json b/data/tablet/samsung/2011/p6210-galaxy-tab-7-0-plus/samsung-p6210-galaxy-tab-7-0-plus-scrapegsma-8285.json
index e711e68ac7edc..3703b3e2b658d 100644
--- a/data/tablet/samsung/2011/p6210-galaxy-tab-7-0-plus/samsung-p6210-galaxy-tab-7-0-plus-scrapegsma-8285.json
+++ b/data/tablet/samsung/2011/p6210-galaxy-tab-7-0-plus/samsung-p6210-galaxy-tab-7-0-plus-scrapegsma-8285.json
@@ -35,7 +35,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/p6800-galaxy-tab-7-7/samsung-p6800-galaxy-tab-7-7-scrapegsma-8291.json b/data/tablet/samsung/2011/p6800-galaxy-tab-7-7/samsung-p6800-galaxy-tab-7-7-scrapegsma-8291.json
index ef19d00d84ae0..8d0b5725eb338 100644
--- a/data/tablet/samsung/2011/p6800-galaxy-tab-7-7/samsung-p6800-galaxy-tab-7-7-scrapegsma-8291.json
+++ b/data/tablet/samsung/2011/p6800-galaxy-tab-7-7/samsung-p6800-galaxy-tab-7-7-scrapegsma-8291.json
@@ -38,7 +38,8 @@
     "ppi": 196
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/p6810-galaxy-tab-7-7/samsung-p6810-galaxy-tab-7-7-scrapegsma-8290.json b/data/tablet/samsung/2011/p6810-galaxy-tab-7-7/samsung-p6810-galaxy-tab-7-7-scrapegsma-8290.json
index 0ce0d0f0572c1..05be500713bc6 100644
--- a/data/tablet/samsung/2011/p6810-galaxy-tab-7-7/samsung-p6810-galaxy-tab-7-7-scrapegsma-8290.json
+++ b/data/tablet/samsung/2011/p6810-galaxy-tab-7-7/samsung-p6810-galaxy-tab-7-7-scrapegsma-8290.json
@@ -35,7 +35,8 @@
     "ppi": 196
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2011/p7500-galaxy-tab-10-1-3g/samsung-p7500-galaxy-tab-10-1-3g-scrapegsma-8344.json b/data/tablet/samsung/2011/p7500-galaxy-tab-10-1-3g/samsung-p7500-galaxy-tab-10-1-3g-scrapegsma-8344.json
index df2a97c880989..1a2997277ac69 100644
--- a/data/tablet/samsung/2011/p7500-galaxy-tab-10-1-3g/samsung-p7500-galaxy-tab-10-1-3g-scrapegsma-8344.json
+++ b/data/tablet/samsung/2011/p7500-galaxy-tab-10-1-3g/samsung-p7500-galaxy-tab-10-1-3g-scrapegsma-8344.json
@@ -38,7 +38,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/ativ-tab-p8510/samsung-ativ-tab-p8510-scrapegsma-8180.json b/data/tablet/samsung/2012/ativ-tab-p8510/samsung-ativ-tab-p8510-scrapegsma-8180.json
index 67afcf84a0724..a6a0cf378a1ee 100644
--- a/data/tablet/samsung/2012/ativ-tab-p8510/samsung-ativ-tab-p8510-scrapegsma-8180.json
+++ b/data/tablet/samsung/2012/ativ-tab-p8510/samsung-ativ-tab-p8510-scrapegsma-8180.json
@@ -39,7 +39,7 @@
     "ppi": 155
   },
   "storage_options_gb": [
-    2,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-10-1-cdma/samsung-galaxy-tab-2-10-1-cdma-scrapegsma-8234.json b/data/tablet/samsung/2012/galaxy-tab-2-10-1-cdma/samsung-galaxy-tab-2-10-1-cdma-scrapegsma-8234.json
index 69f60ca8f1b67..ce732aefded45 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-10-1-cdma/samsung-galaxy-tab-2-10-1-cdma-scrapegsma-8234.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-10-1-cdma/samsung-galaxy-tab-2-10-1-cdma-scrapegsma-8234.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5100/samsung-galaxy-tab-2-10-1-p5100-scrapegsma-8235.json b/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5100/samsung-galaxy-tab-2-10-1-p5100-scrapegsma-8235.json
index 619337397251b..634c63a054852 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5100/samsung-galaxy-tab-2-10-1-p5100-scrapegsma-8235.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5100/samsung-galaxy-tab-2-10-1-p5100-scrapegsma-8235.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5110/samsung-galaxy-tab-2-10-1-p5110-scrapegsma-8233.json b/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5110/samsung-galaxy-tab-2-10-1-p5110-scrapegsma-8233.json
index fa396d4653a6b..ef6b5a57d0dac 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5110/samsung-galaxy-tab-2-10-1-p5110-scrapegsma-8233.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-10-1-p5110/samsung-galaxy-tab-2-10-1-p5110-scrapegsma-8233.json
@@ -35,7 +35,8 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-7-0-i705/samsung-galaxy-tab-2-7-0-i705-scrapegsma-8200.json b/data/tablet/samsung/2012/galaxy-tab-2-7-0-i705/samsung-galaxy-tab-2-7-0-i705-scrapegsma-8200.json
index 1c2cf05e29a90..c3b4698f18975 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-7-0-i705/samsung-galaxy-tab-2-7-0-i705-scrapegsma-8200.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-7-0-i705/samsung-galaxy-tab-2-7-0-i705-scrapegsma-8200.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3100/samsung-galaxy-tab-2-7-0-p3100-scrapegsma-8244.json b/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3100/samsung-galaxy-tab-2-7-0-p3100-scrapegsma-8244.json
index 0bf1de68c7410..88b32ee933a9b 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3100/samsung-galaxy-tab-2-7-0-p3100-scrapegsma-8244.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3100/samsung-galaxy-tab-2-7-0-p3100-scrapegsma-8244.json
@@ -43,7 +43,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3110/samsung-galaxy-tab-2-7-0-p3110-scrapegsma-8243.json b/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3110/samsung-galaxy-tab-2-7-0-p3110-scrapegsma-8243.json
index dc7675210b789..04903b26bfb0f 100644
--- a/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3110/samsung-galaxy-tab-2-7-0-p3110-scrapegsma-8243.json
+++ b/data/tablet/samsung/2012/galaxy-tab-2-7-0-p3110/samsung-galaxy-tab-2-7-0-p3110-scrapegsma-8243.json
@@ -35,7 +35,8 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-7-7-lte-i815/samsung-galaxy-tab-7-7-lte-i815-scrapegsma-8252.json b/data/tablet/samsung/2012/galaxy-tab-7-7-lte-i815/samsung-galaxy-tab-7-7-lte-i815-scrapegsma-8252.json
index 07b2c5f8c67fc..0ee26dd3f3f9d 100644
--- a/data/tablet/samsung/2012/galaxy-tab-7-7-lte-i815/samsung-galaxy-tab-7-7-lte-i815-scrapegsma-8252.json
+++ b/data/tablet/samsung/2012/galaxy-tab-7-7-lte-i815/samsung-galaxy-tab-7-7-lte-i815-scrapegsma-8252.json
@@ -38,7 +38,7 @@
     "ppi": 196
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2012/galaxy-tab-8-9-4g-p7320t/samsung-galaxy-tab-8-9-4g-p7320t-scrapegsma-8216.json b/data/tablet/samsung/2012/galaxy-tab-8-9-4g-p7320t/samsung-galaxy-tab-8-9-4g-p7320t-scrapegsma-8216.json
index 5df498c1aefd6..141267fac2af8 100644
--- a/data/tablet/samsung/2012/galaxy-tab-8-9-4g-p7320t/samsung-galaxy-tab-8-9-4g-p7320t-scrapegsma-8216.json
+++ b/data/tablet/samsung/2012/galaxy-tab-8-9-4g-p7320t/samsung-galaxy-tab-8-9-4g-p7320t-scrapegsma-8216.json
@@ -38,7 +38,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5200/samsung-galaxy-tab-3-10-1-p5200-scrapegsma-8137.json b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5200/samsung-galaxy-tab-3-10-1-p5200-scrapegsma-8137.json
index 9e00485d42d29..9a7c671c966f4 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5200/samsung-galaxy-tab-3-10-1-p5200-scrapegsma-8137.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5200/samsung-galaxy-tab-3-10-1-p5200-scrapegsma-8137.json
@@ -41,7 +41,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5210/samsung-galaxy-tab-3-10-1-p5210-scrapegsma-8138.json b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5210/samsung-galaxy-tab-3-10-1-p5210-scrapegsma-8138.json
index dc5e8d0604cca..b8fb264144574 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5210/samsung-galaxy-tab-3-10-1-p5210-scrapegsma-8138.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5210/samsung-galaxy-tab-3-10-1-p5210-scrapegsma-8138.json
@@ -38,7 +38,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5220/samsung-galaxy-tab-3-10-1-p5220-scrapegsma-8136.json b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5220/samsung-galaxy-tab-3-10-1-p5220-scrapegsma-8136.json
index c56f112d35247..b6bf8854abc98 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5220/samsung-galaxy-tab-3-10-1-p5220-scrapegsma-8136.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-10-1-p5220/samsung-galaxy-tab-3-10-1-p5220-scrapegsma-8136.json
@@ -41,7 +41,7 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-7-0-wifi/samsung-galaxy-tab-3-7-0-wifi-scrapegsma-8141.json b/data/tablet/samsung/2013/galaxy-tab-3-7-0-wifi/samsung-galaxy-tab-3-7-0-wifi-scrapegsma-8141.json
index 317bc545ef851..2786da11dadb4 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-7-0-wifi/samsung-galaxy-tab-3-7-0-wifi-scrapegsma-8141.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-7-0-wifi/samsung-galaxy-tab-3-7-0-wifi-scrapegsma-8141.json
@@ -39,7 +39,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-7-0/samsung-galaxy-tab-3-7-0-scrapegsma-8142.json b/data/tablet/samsung/2013/galaxy-tab-3-7-0/samsung-galaxy-tab-3-7-0-scrapegsma-8142.json
index e99e15ad5ed84..5ecd133f6d73d 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-7-0/samsung-galaxy-tab-3-7-0-scrapegsma-8142.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-7-0/samsung-galaxy-tab-3-7-0-scrapegsma-8142.json
@@ -43,7 +43,7 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2013/galaxy-tab-3-8-0/samsung-galaxy-tab-3-8-0-scrapegsma-8135.json b/data/tablet/samsung/2013/galaxy-tab-3-8-0/samsung-galaxy-tab-3-8-0-scrapegsma-8135.json
index 755cc5aa5faa3..c755d8f5a4f71 100644
--- a/data/tablet/samsung/2013/galaxy-tab-3-8-0/samsung-galaxy-tab-3-8-0-scrapegsma-8135.json
+++ b/data/tablet/samsung/2013/galaxy-tab-3-8-0/samsung-galaxy-tab-3-8-0-scrapegsma-8135.json
@@ -43,7 +43,7 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0-3g/samsung-galaxy-tab-3-lite-7-0-3g-scrapegsma-8093.json b/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0-3g/samsung-galaxy-tab-3-lite-7-0-3g-scrapegsma-8093.json
index b62828cc987d8..bd54df3d77a16 100644
--- a/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0-3g/samsung-galaxy-tab-3-lite-7-0-3g-scrapegsma-8093.json
+++ b/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0-3g/samsung-galaxy-tab-3-lite-7-0-3g-scrapegsma-8093.json
@@ -41,7 +41,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0/samsung-galaxy-tab-3-lite-7-0-scrapegsma-8094.json b/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0/samsung-galaxy-tab-3-lite-7-0-scrapegsma-8094.json
index 09496823c5e1c..ef4085c8a0b02 100644
--- a/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0/samsung-galaxy-tab-3-lite-7-0-scrapegsma-8094.json
+++ b/data/tablet/samsung/2014/galaxy-tab-3-lite-7-0/samsung-galaxy-tab-3-lite-7-0-scrapegsma-8094.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-10-1-3g/samsung-galaxy-tab-4-10-1-3g-scrapegsma-8078.json b/data/tablet/samsung/2014/galaxy-tab-4-10-1-3g/samsung-galaxy-tab-4-10-1-3g-scrapegsma-8078.json
index fe3529e3668d6..9fbb3140afa92 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-10-1-3g/samsung-galaxy-tab-4-10-1-3g-scrapegsma-8078.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-10-1-3g/samsung-galaxy-tab-4-10-1-3g-scrapegsma-8078.json
@@ -41,7 +41,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-10-1-lte/samsung-galaxy-tab-4-10-1-lte-scrapegsma-8079.json b/data/tablet/samsung/2014/galaxy-tab-4-10-1-lte/samsung-galaxy-tab-4-10-1-lte-scrapegsma-8079.json
index 68cec86a2bc0d..f5f44af446ea5 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-10-1-lte/samsung-galaxy-tab-4-10-1-lte-scrapegsma-8079.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-10-1-lte/samsung-galaxy-tab-4-10-1-lte-scrapegsma-8079.json
@@ -41,7 +41,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-10-1/samsung-galaxy-tab-4-10-1-scrapegsma-8077.json b/data/tablet/samsung/2014/galaxy-tab-4-10-1/samsung-galaxy-tab-4-10-1-scrapegsma-8077.json
index 9c5ffc6a7cebc..42a341cc81a43 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-10-1/samsung-galaxy-tab-4-10-1-scrapegsma-8077.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-10-1/samsung-galaxy-tab-4-10-1-scrapegsma-8077.json
@@ -38,7 +38,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-7-0-3g/samsung-galaxy-tab-4-7-0-3g-scrapegsma-8072.json b/data/tablet/samsung/2014/galaxy-tab-4-7-0-3g/samsung-galaxy-tab-4-7-0-3g-scrapegsma-8072.json
index 3a7a6f0d38cb2..ac2a9ba4069b0 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-7-0-3g/samsung-galaxy-tab-4-7-0-3g-scrapegsma-8072.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-7-0-3g/samsung-galaxy-tab-4-7-0-3g-scrapegsma-8072.json
@@ -41,7 +41,7 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-7-0-lte/samsung-galaxy-tab-4-7-0-lte-scrapegsma-8073.json b/data/tablet/samsung/2014/galaxy-tab-4-7-0-lte/samsung-galaxy-tab-4-7-0-lte-scrapegsma-8073.json
index 6820c9057bb7c..0a421ef71b005 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-7-0-lte/samsung-galaxy-tab-4-7-0-lte-scrapegsma-8073.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-7-0-lte/samsung-galaxy-tab-4-7-0-lte-scrapegsma-8073.json
@@ -41,7 +41,7 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-7-0/samsung-galaxy-tab-4-7-0-scrapegsma-8071.json b/data/tablet/samsung/2014/galaxy-tab-4-7-0/samsung-galaxy-tab-4-7-0-scrapegsma-8071.json
index ec1492d21502c..8034140ab944c 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-7-0/samsung-galaxy-tab-4-7-0-scrapegsma-8071.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-7-0/samsung-galaxy-tab-4-7-0-scrapegsma-8071.json
@@ -39,7 +39,7 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-8-0-3g/samsung-galaxy-tab-4-8-0-3g-scrapegsma-8075.json b/data/tablet/samsung/2014/galaxy-tab-4-8-0-3g/samsung-galaxy-tab-4-8-0-3g-scrapegsma-8075.json
index 3b74290564b1b..da379b2dc1091 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-8-0-3g/samsung-galaxy-tab-4-8-0-3g-scrapegsma-8075.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-8-0-3g/samsung-galaxy-tab-4-8-0-3g-scrapegsma-8075.json
@@ -41,7 +41,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-8-0-lte/samsung-galaxy-tab-4-8-0-lte-scrapegsma-8076.json b/data/tablet/samsung/2014/galaxy-tab-4-8-0-lte/samsung-galaxy-tab-4-8-0-lte-scrapegsma-8076.json
index 8c3b0e5535ee8..bc90ae42eeb28 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-8-0-lte/samsung-galaxy-tab-4-8-0-lte-scrapegsma-8076.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-8-0-lte/samsung-galaxy-tab-4-8-0-lte-scrapegsma-8076.json
@@ -41,7 +41,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-4-8-0/samsung-galaxy-tab-4-8-0-scrapegsma-8074.json b/data/tablet/samsung/2014/galaxy-tab-4-8-0/samsung-galaxy-tab-4-8-0-scrapegsma-8074.json
index 9d02b63944e33..6b259951d0521 100644
--- a/data/tablet/samsung/2014/galaxy-tab-4-8-0/samsung-galaxy-tab-4-8-0-scrapegsma-8074.json
+++ b/data/tablet/samsung/2014/galaxy-tab-4-8-0/samsung-galaxy-tab-4-8-0-scrapegsma-8074.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-active-lte/samsung-galaxy-tab-active-lte-scrapegsma-8030.json b/data/tablet/samsung/2014/galaxy-tab-active-lte/samsung-galaxy-tab-active-lte-scrapegsma-8030.json
index 1e17a8cf794c3..af185304765bb 100644
--- a/data/tablet/samsung/2014/galaxy-tab-active-lte/samsung-galaxy-tab-active-lte-scrapegsma-8030.json
+++ b/data/tablet/samsung/2014/galaxy-tab-active-lte/samsung-galaxy-tab-active-lte-scrapegsma-8030.json
@@ -41,7 +41,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-active/samsung-galaxy-tab-active-scrapegsma-8031.json b/data/tablet/samsung/2014/galaxy-tab-active/samsung-galaxy-tab-active-scrapegsma-8031.json
index 381dcaeb00dc5..01d9f008dd963 100644
--- a/data/tablet/samsung/2014/galaxy-tab-active/samsung-galaxy-tab-active-scrapegsma-8031.json
+++ b/data/tablet/samsung/2014/galaxy-tab-active/samsung-galaxy-tab-active-scrapegsma-8031.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-10-1-lte/samsung-galaxy-tab-pro-10-1-lte-scrapegsma-8102.json b/data/tablet/samsung/2014/galaxy-tab-pro-10-1-lte/samsung-galaxy-tab-pro-10-1-lte-scrapegsma-8102.json
index 96053a272affb..84aded438febe 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-10-1-lte/samsung-galaxy-tab-pro-10-1-lte-scrapegsma-8102.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-10-1-lte/samsung-galaxy-tab-pro-10-1-lte-scrapegsma-8102.json
@@ -41,7 +41,7 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-10-1/samsung-galaxy-tab-pro-10-1-scrapegsma-8103.json b/data/tablet/samsung/2014/galaxy-tab-pro-10-1/samsung-galaxy-tab-pro-10-1-scrapegsma-8103.json
index 193ed2ecb691e..17354563e2a16 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-10-1/samsung-galaxy-tab-pro-10-1-scrapegsma-8103.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-10-1/samsung-galaxy-tab-pro-10-1-scrapegsma-8103.json
@@ -38,7 +38,7 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-12-2-3g/samsung-galaxy-tab-pro-12-2-3g-scrapegsma-8100.json b/data/tablet/samsung/2014/galaxy-tab-pro-12-2-3g/samsung-galaxy-tab-pro-12-2-3g-scrapegsma-8100.json
index 39afe0a3f7650..2b44cbdfd0fed 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-12-2-3g/samsung-galaxy-tab-pro-12-2-3g-scrapegsma-8100.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-12-2-3g/samsung-galaxy-tab-pro-12-2-3g-scrapegsma-8100.json
@@ -38,7 +38,7 @@
     "ppi": 247
   },
   "storage_options_gb": [
-    3,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-12-2-lte/samsung-galaxy-tab-pro-12-2-lte-scrapegsma-8099.json b/data/tablet/samsung/2014/galaxy-tab-pro-12-2-lte/samsung-galaxy-tab-pro-12-2-lte-scrapegsma-8099.json
index 1e3ed00020c79..35f8cc745261f 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-12-2-lte/samsung-galaxy-tab-pro-12-2-lte-scrapegsma-8099.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-12-2-lte/samsung-galaxy-tab-pro-12-2-lte-scrapegsma-8099.json
@@ -41,7 +41,7 @@
     "ppi": 247
   },
   "storage_options_gb": [
-    3,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-12-2/samsung-galaxy-tab-pro-12-2-scrapegsma-8101.json b/data/tablet/samsung/2014/galaxy-tab-pro-12-2/samsung-galaxy-tab-pro-12-2-scrapegsma-8101.json
index e6d1faa4e431a..8ed89e2836c0c 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-12-2/samsung-galaxy-tab-pro-12-2-scrapegsma-8101.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-12-2/samsung-galaxy-tab-pro-12-2-scrapegsma-8101.json
@@ -38,7 +38,7 @@
     "ppi": 247
   },
   "storage_options_gb": [
-    3,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-8-4-3g-lte/samsung-galaxy-tab-pro-8-4-3g-lte-scrapegsma-8104.json b/data/tablet/samsung/2014/galaxy-tab-pro-8-4-3g-lte/samsung-galaxy-tab-pro-8-4-3g-lte-scrapegsma-8104.json
index 6fdda2852272f..5c54dfb1d3091 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-8-4-3g-lte/samsung-galaxy-tab-pro-8-4-3g-lte-scrapegsma-8104.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-8-4-3g-lte/samsung-galaxy-tab-pro-8-4-3g-lte-scrapegsma-8104.json
@@ -42,7 +42,7 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-pro-8-4/samsung-galaxy-tab-pro-8-4-scrapegsma-8105.json b/data/tablet/samsung/2014/galaxy-tab-pro-8-4/samsung-galaxy-tab-pro-8-4-scrapegsma-8105.json
index 233aa421c76fa..c7a6a69da7c01 100644
--- a/data/tablet/samsung/2014/galaxy-tab-pro-8-4/samsung-galaxy-tab-pro-8-4-scrapegsma-8105.json
+++ b/data/tablet/samsung/2014/galaxy-tab-pro-8-4/samsung-galaxy-tab-pro-8-4-scrapegsma-8105.json
@@ -38,7 +38,7 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-s-10-5-lte/samsung-galaxy-tab-s-10-5-lte-scrapegsma-8059.json b/data/tablet/samsung/2014/galaxy-tab-s-10-5-lte/samsung-galaxy-tab-s-10-5-lte-scrapegsma-8059.json
index 6e6429381553d..17f1a7b9533dc 100644
--- a/data/tablet/samsung/2014/galaxy-tab-s-10-5-lte/samsung-galaxy-tab-s-10-5-lte-scrapegsma-8059.json
+++ b/data/tablet/samsung/2014/galaxy-tab-s-10-5-lte/samsung-galaxy-tab-s-10-5-lte-scrapegsma-8059.json
@@ -41,7 +41,7 @@
     "ppi": 288
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-s-10-5/samsung-galaxy-tab-s-10-5-scrapegsma-8060.json b/data/tablet/samsung/2014/galaxy-tab-s-10-5/samsung-galaxy-tab-s-10-5-scrapegsma-8060.json
index fe252ca51691f..c2fc4c1be37c4 100644
--- a/data/tablet/samsung/2014/galaxy-tab-s-10-5/samsung-galaxy-tab-s-10-5-scrapegsma-8060.json
+++ b/data/tablet/samsung/2014/galaxy-tab-s-10-5/samsung-galaxy-tab-s-10-5-scrapegsma-8060.json
@@ -38,7 +38,7 @@
     "ppi": 288
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-s-8-4-lte/samsung-galaxy-tab-s-8-4-lte-scrapegsma-8057.json b/data/tablet/samsung/2014/galaxy-tab-s-8-4-lte/samsung-galaxy-tab-s-8-4-lte-scrapegsma-8057.json
index 67abd84524f73..5eee17e500a6f 100644
--- a/data/tablet/samsung/2014/galaxy-tab-s-8-4-lte/samsung-galaxy-tab-s-8-4-lte-scrapegsma-8057.json
+++ b/data/tablet/samsung/2014/galaxy-tab-s-8-4-lte/samsung-galaxy-tab-s-8-4-lte-scrapegsma-8057.json
@@ -41,7 +41,7 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2014/galaxy-tab-s-8-4/samsung-galaxy-tab-s-8-4-scrapegsma-8058.json b/data/tablet/samsung/2014/galaxy-tab-s-8-4/samsung-galaxy-tab-s-8-4-scrapegsma-8058.json
index 9913a79cbcda0..076b360e521ef 100644
--- a/data/tablet/samsung/2014/galaxy-tab-s-8-4/samsung-galaxy-tab-s-8-4-scrapegsma-8058.json
+++ b/data/tablet/samsung/2014/galaxy-tab-s-8-4/samsung-galaxy-tab-s-8-4-scrapegsma-8058.json
@@ -38,7 +38,7 @@
     "ppi": 359
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-3-lite-7-0-ve/samsung-galaxy-tab-3-lite-7-0-ve-scrapegsma-8008.json b/data/tablet/samsung/2015/galaxy-tab-3-lite-7-0-ve/samsung-galaxy-tab-3-lite-7-0-ve-scrapegsma-8008.json
index 9f6e7df5922f1..ad943902381c1 100644
--- a/data/tablet/samsung/2015/galaxy-tab-3-lite-7-0-ve/samsung-galaxy-tab-3-lite-7-0-ve-scrapegsma-8008.json
+++ b/data/tablet/samsung/2015/galaxy-tab-3-lite-7-0-ve/samsung-galaxy-tab-3-lite-7-0-ve-scrapegsma-8008.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-3-v/samsung-galaxy-tab-3-v-scrapegsma-7993.json b/data/tablet/samsung/2015/galaxy-tab-3-v/samsung-galaxy-tab-3-v-scrapegsma-7993.json
index 2af6fda7f2ed3..7c0c30af18aff 100644
--- a/data/tablet/samsung/2015/galaxy-tab-3-v/samsung-galaxy-tab-3-v-scrapegsma-7993.json
+++ b/data/tablet/samsung/2015/galaxy-tab-3-v/samsung-galaxy-tab-3-v-scrapegsma-7993.json
@@ -45,7 +45,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-4-10-1-2015/samsung-galaxy-tab-4-10-1-2015-scrapegsma-7987.json b/data/tablet/samsung/2015/galaxy-tab-4-10-1-2015/samsung-galaxy-tab-4-10-1-2015-scrapegsma-7987.json
index 3b08b9118b55e..9b3d1bb4440d7 100644
--- a/data/tablet/samsung/2015/galaxy-tab-4-10-1-2015/samsung-galaxy-tab-4-10-1-2015-scrapegsma-7987.json
+++ b/data/tablet/samsung/2015/galaxy-tab-4-10-1-2015/samsung-galaxy-tab-4-10-1-2015-scrapegsma-7987.json
@@ -38,7 +38,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-4-8-0-2015/samsung-galaxy-tab-4-8-0-2015-scrapegsma-8047.json b/data/tablet/samsung/2015/galaxy-tab-4-8-0-2015/samsung-galaxy-tab-4-8-0-2015-scrapegsma-8047.json
index 6c3a86261cfc2..10bc11e190b54 100644
--- a/data/tablet/samsung/2015/galaxy-tab-4-8-0-2015/samsung-galaxy-tab-4-8-0-2015-scrapegsma-8047.json
+++ b/data/tablet/samsung/2015/galaxy-tab-4-8-0-2015/samsung-galaxy-tab-4-8-0-2015-scrapegsma-8047.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen-2015/samsung-galaxy-tab-a-8-0-and-s-pen-2015-scrapegsma-1512.json b/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen-2015/samsung-galaxy-tab-a-8-0-and-s-pen-2015-scrapegsma-1512.json
index b4a95df7491b5..5e7be3833f3b8 100644
--- a/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen-2015/samsung-galaxy-tab-a-8-0-and-s-pen-2015-scrapegsma-1512.json
+++ b/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen-2015/samsung-galaxy-tab-a-8-0-and-s-pen-2015-scrapegsma-1512.json
@@ -41,7 +41,6 @@
     "ppi": 160
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen/samsung-galaxy-tab-a-8-0-and-s-pen-scrapegsma-7996.json b/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen/samsung-galaxy-tab-a-8-0-and-s-pen-scrapegsma-7996.json
index 16c83d136771c..a01d473a3feed 100644
--- a/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen/samsung-galaxy-tab-a-8-0-and-s-pen-scrapegsma-7996.json
+++ b/data/tablet/samsung/2015/galaxy-tab-a-8-0-and-s-pen/samsung-galaxy-tab-a-8-0-and-s-pen-scrapegsma-7996.json
@@ -38,7 +38,6 @@
     "ppi": 160
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-a-9-7-and-s-pen/samsung-galaxy-tab-a-9-7-and-s-pen-scrapegsma-7994.json b/data/tablet/samsung/2015/galaxy-tab-a-9-7-and-s-pen/samsung-galaxy-tab-a-9-7-and-s-pen-scrapegsma-7994.json
index 0405f98f686c8..2e30188f9627e 100644
--- a/data/tablet/samsung/2015/galaxy-tab-a-9-7-and-s-pen/samsung-galaxy-tab-a-9-7-and-s-pen-scrapegsma-7994.json
+++ b/data/tablet/samsung/2015/galaxy-tab-a-9-7-and-s-pen/samsung-galaxy-tab-a-9-7-and-s-pen-scrapegsma-7994.json
@@ -42,7 +42,6 @@
     "ppi": 132
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-s2-8-0/samsung-galaxy-tab-s2-8-0-scrapegsma-7980.json b/data/tablet/samsung/2015/galaxy-tab-s2-8-0/samsung-galaxy-tab-s2-8-0-scrapegsma-7980.json
index ea33c57c9caa8..1eb1f03f62406 100644
--- a/data/tablet/samsung/2015/galaxy-tab-s2-8-0/samsung-galaxy-tab-s2-8-0-scrapegsma-7980.json
+++ b/data/tablet/samsung/2015/galaxy-tab-s2-8-0/samsung-galaxy-tab-s2-8-0-scrapegsma-7980.json
@@ -43,7 +43,7 @@
     "ppi": 320
   },
   "storage_options_gb": [
-    3,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2015/galaxy-tab-s2-9-7/samsung-galaxy-tab-s2-9-7-scrapegsma-7979.json b/data/tablet/samsung/2015/galaxy-tab-s2-9-7/samsung-galaxy-tab-s2-9-7-scrapegsma-7979.json
index b62ac8a52f7f8..1fa4da60c2f96 100644
--- a/data/tablet/samsung/2015/galaxy-tab-s2-9-7/samsung-galaxy-tab-s2-9-7-scrapegsma-7979.json
+++ b/data/tablet/samsung/2015/galaxy-tab-s2-9-7/samsung-galaxy-tab-s2-9-7-scrapegsma-7979.json
@@ -44,7 +44,7 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    3,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2016/galaxy-tab-a-10-1-2016/samsung-galaxy-tab-a-10-1-2016-scrapegsma-7946.json b/data/tablet/samsung/2016/galaxy-tab-a-10-1-2016/samsung-galaxy-tab-a-10-1-2016-scrapegsma-7946.json
index 815b036041719..ba4a1adf7a1c4 100644
--- a/data/tablet/samsung/2016/galaxy-tab-a-10-1-2016/samsung-galaxy-tab-a-10-1-2016-scrapegsma-7946.json
+++ b/data/tablet/samsung/2016/galaxy-tab-a-10-1-2016/samsung-galaxy-tab-a-10-1-2016-scrapegsma-7946.json
@@ -44,8 +44,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
-    3,
     16,
     32
   ],
diff --git a/data/tablet/samsung/2016/galaxy-tab-a-7-0-2016/samsung-galaxy-tab-a-7-0-2016-scrapegsma-7947.json b/data/tablet/samsung/2016/galaxy-tab-a-7-0-2016/samsung-galaxy-tab-a-7-0-2016-scrapegsma-7947.json
index 7b37a7d484675..a7e1773503b11 100644
--- a/data/tablet/samsung/2016/galaxy-tab-a-7-0-2016/samsung-galaxy-tab-a-7-0-2016-scrapegsma-7947.json
+++ b/data/tablet/samsung/2016/galaxy-tab-a-7-0-2016/samsung-galaxy-tab-a-7-0-2016-scrapegsma-7947.json
@@ -42,7 +42,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2016/galaxy-tab-e-8-0/samsung-galaxy-tab-e-8-0-scrapegsma-7954.json b/data/tablet/samsung/2016/galaxy-tab-e-8-0/samsung-galaxy-tab-e-8-0-scrapegsma-7954.json
index c0af79f9d7580..78089efa54b5d 100644
--- a/data/tablet/samsung/2016/galaxy-tab-e-8-0/samsung-galaxy-tab-e-8-0-scrapegsma-7954.json
+++ b/data/tablet/samsung/2016/galaxy-tab-e-8-0/samsung-galaxy-tab-e-8-0-scrapegsma-7954.json
@@ -45,7 +45,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2016/galaxy-tab-j/samsung-galaxy-tab-j-scrapegsma-7933.json b/data/tablet/samsung/2016/galaxy-tab-j/samsung-galaxy-tab-j-scrapegsma-7933.json
index 3df49e06c70a3..07c2a05670143 100644
--- a/data/tablet/samsung/2016/galaxy-tab-j/samsung-galaxy-tab-j-scrapegsma-7933.json
+++ b/data/tablet/samsung/2016/galaxy-tab-j/samsung-galaxy-tab-j-scrapegsma-7933.json
@@ -41,7 +41,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2017/galaxy-tab-a-8-0-2017/samsung-galaxy-tab-a-8-0-2017-scrapegsma-7891.json b/data/tablet/samsung/2017/galaxy-tab-a-8-0-2017/samsung-galaxy-tab-a-8-0-2017-scrapegsma-7891.json
index dea3042c9f860..bb2446ac753b3 100644
--- a/data/tablet/samsung/2017/galaxy-tab-a-8-0-2017/samsung-galaxy-tab-a-8-0-2017-scrapegsma-7891.json
+++ b/data/tablet/samsung/2017/galaxy-tab-a-8-0-2017/samsung-galaxy-tab-a-8-0-2017-scrapegsma-7891.json
@@ -42,7 +42,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2017/galaxy-tab-active-2/samsung-galaxy-tab-active-2-scrapegsma-7890.json b/data/tablet/samsung/2017/galaxy-tab-active-2/samsung-galaxy-tab-active-2-scrapegsma-7890.json
index d1f4370628ba1..225f47ec00451 100644
--- a/data/tablet/samsung/2017/galaxy-tab-active-2/samsung-galaxy-tab-active-2-scrapegsma-7890.json
+++ b/data/tablet/samsung/2017/galaxy-tab-active-2/samsung-galaxy-tab-active-2-scrapegsma-7890.json
@@ -38,7 +38,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    3,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2017/galaxy-tab-s3-9-7/samsung-galaxy-tab-s3-9-7-scrapegsma-7909.json b/data/tablet/samsung/2017/galaxy-tab-s3-9-7/samsung-galaxy-tab-s3-9-7-scrapegsma-7909.json
index 4230b3c9ae18b..f51b77b8c05d6 100644
--- a/data/tablet/samsung/2017/galaxy-tab-s3-9-7/samsung-galaxy-tab-s3-9-7-scrapegsma-7909.json
+++ b/data/tablet/samsung/2017/galaxy-tab-s3-9-7/samsung-galaxy-tab-s3-9-7-scrapegsma-7909.json
@@ -42,7 +42,6 @@
     "ppi": 264
   },
   "storage_options_gb": [
-    4,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2018/galaxy-tab-a-10-5/samsung-galaxy-tab-a-10-5-scrapegsma-7861.json b/data/tablet/samsung/2018/galaxy-tab-a-10-5/samsung-galaxy-tab-a-10-5-scrapegsma-7861.json
index 0e62553d3a83c..795a9e967a307 100644
--- a/data/tablet/samsung/2018/galaxy-tab-a-10-5/samsung-galaxy-tab-a-10-5-scrapegsma-7861.json
+++ b/data/tablet/samsung/2018/galaxy-tab-a-10-5/samsung-galaxy-tab-a-10-5-scrapegsma-7861.json
@@ -42,7 +42,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2018/galaxy-tab-a-8-0-2018/samsung-galaxy-tab-a-8-0-2018-scrapegsma-7859.json b/data/tablet/samsung/2018/galaxy-tab-a-8-0-2018/samsung-galaxy-tab-a-8-0-2018-scrapegsma-7859.json
index b900eb64e7782..698af32af837f 100644
--- a/data/tablet/samsung/2018/galaxy-tab-a-8-0-2018/samsung-galaxy-tab-a-8-0-2018-scrapegsma-7859.json
+++ b/data/tablet/samsung/2018/galaxy-tab-a-8-0-2018/samsung-galaxy-tab-a-8-0-2018-scrapegsma-7859.json
@@ -43,7 +43,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2018/galaxy-tab-advanced2/samsung-galaxy-tab-advanced2-scrapegsma-7858.json b/data/tablet/samsung/2018/galaxy-tab-advanced2/samsung-galaxy-tab-advanced2-scrapegsma-7858.json
index c64b0e5610fa8..a17228636aba4 100644
--- a/data/tablet/samsung/2018/galaxy-tab-advanced2/samsung-galaxy-tab-advanced2-scrapegsma-7858.json
+++ b/data/tablet/samsung/2018/galaxy-tab-advanced2/samsung-galaxy-tab-advanced2-scrapegsma-7858.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2018/galaxy-tab-s4-10-5/samsung-galaxy-tab-s4-10-5-scrapegsma-7860.json b/data/tablet/samsung/2018/galaxy-tab-s4-10-5/samsung-galaxy-tab-s4-10-5-scrapegsma-7860.json
index 9f6ee6bd08338..78f6fe5f701b2 100644
--- a/data/tablet/samsung/2018/galaxy-tab-s4-10-5/samsung-galaxy-tab-s4-10-5-scrapegsma-7860.json
+++ b/data/tablet/samsung/2018/galaxy-tab-s4-10-5/samsung-galaxy-tab-s4-10-5-scrapegsma-7860.json
@@ -42,8 +42,7 @@
     "ppi": 288
   },
   "storage_options_gb": [
-    4,
-    6,
+    64,
     256
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2019/galaxy-tab-a-10-1-2019/samsung-galaxy-tab-a-10-1-2019-scrapegsma-7856.json b/data/tablet/samsung/2019/galaxy-tab-a-10-1-2019/samsung-galaxy-tab-a-10-1-2019-scrapegsma-7856.json
index 0d1d506ddba2d..274a6f1b23d01 100644
--- a/data/tablet/samsung/2019/galaxy-tab-a-10-1-2019/samsung-galaxy-tab-a-10-1-2019-scrapegsma-7856.json
+++ b/data/tablet/samsung/2019/galaxy-tab-a-10-1-2019/samsung-galaxy-tab-a-10-1-2019-scrapegsma-7856.json
@@ -42,7 +42,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2019/galaxy-tab-a-8-0-2019/samsung-galaxy-tab-a-8-0-2019-scrapegsma-1506.json b/data/tablet/samsung/2019/galaxy-tab-a-8-0-2019/samsung-galaxy-tab-a-8-0-2019-scrapegsma-1506.json
index dca0a7ce34cc4..c6f5db25c5c4a 100644
--- a/data/tablet/samsung/2019/galaxy-tab-a-8-0-2019/samsung-galaxy-tab-a-8-0-2019-scrapegsma-1506.json
+++ b/data/tablet/samsung/2019/galaxy-tab-a-8-0-2019/samsung-galaxy-tab-a-8-0-2019-scrapegsma-1506.json
@@ -42,7 +42,6 @@
     "ppi": 189
   },
   "storage_options_gb": [
-    2,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2019/galaxy-tab-a-8-0-and-s-pen-2019/samsung-galaxy-tab-a-8-0-and-s-pen-2019-scrapegsma-1510.json b/data/tablet/samsung/2019/galaxy-tab-a-8-0-and-s-pen-2019/samsung-galaxy-tab-a-8-0-and-s-pen-2019-scrapegsma-1510.json
index 6d547e43872b3..6408996c1afed 100644
--- a/data/tablet/samsung/2019/galaxy-tab-a-8-0-and-s-pen-2019/samsung-galaxy-tab-a-8-0-and-s-pen-2019-scrapegsma-1510.json
+++ b/data/tablet/samsung/2019/galaxy-tab-a-8-0-and-s-pen-2019/samsung-galaxy-tab-a-8-0-and-s-pen-2019-scrapegsma-1510.json
@@ -42,7 +42,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2019/galaxy-tab-a-8-2019/samsung-galaxy-tab-a-8-2019-scrapegsma-7857.json b/data/tablet/samsung/2019/galaxy-tab-a-8-2019/samsung-galaxy-tab-a-8-2019-scrapegsma-7857.json
index 1ff8714539310..f55cc864b1195 100644
--- a/data/tablet/samsung/2019/galaxy-tab-a-8-2019/samsung-galaxy-tab-a-8-2019-scrapegsma-7857.json
+++ b/data/tablet/samsung/2019/galaxy-tab-a-8-2019/samsung-galaxy-tab-a-8-2019-scrapegsma-7857.json
@@ -42,7 +42,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2019/galaxy-tab-active-pro/samsung-galaxy-tab-active-pro-scrapegsma-1493.json b/data/tablet/samsung/2019/galaxy-tab-active-pro/samsung-galaxy-tab-active-pro-scrapegsma-1493.json
index f6dfc587158be..c910a3ee03bf1 100644
--- a/data/tablet/samsung/2019/galaxy-tab-active-pro/samsung-galaxy-tab-active-pro-scrapegsma-1493.json
+++ b/data/tablet/samsung/2019/galaxy-tab-active-pro/samsung-galaxy-tab-active-pro-scrapegsma-1493.json
@@ -42,7 +42,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/samsung/2020/galaxy-tab-s6-5g/samsung-galaxy-tab-s6-5g-scrapegsma-1480.json b/data/tablet/samsung/2020/galaxy-tab-s6-5g/samsung-galaxy-tab-s6-5g-scrapegsma-1480.json
index 467cd1f584401..7686d9560ffdd 100644
--- a/data/tablet/samsung/2020/galaxy-tab-s6-5g/samsung-galaxy-tab-s6-5g-scrapegsma-1480.json
+++ b/data/tablet/samsung/2020/galaxy-tab-s6-5g/samsung-galaxy-tab-s6-5g-scrapegsma-1480.json
@@ -41,7 +41,6 @@
     "ppi": 288
   },
   "storage_options_gb": [
-    6,
     128
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2011/tablet-p-3g/sony-tablet-p-3g-scrapegsma-9247.json b/data/tablet/sony/2011/tablet-p-3g/sony-tablet-p-3g-scrapegsma-9247.json
index 46e1bfd9d3717..41a946c420cc4 100644
--- a/data/tablet/sony/2011/tablet-p-3g/sony-tablet-p-3g-scrapegsma-9247.json
+++ b/data/tablet/sony/2011/tablet-p-3g/sony-tablet-p-3g-scrapegsma-9247.json
@@ -38,7 +38,6 @@
     "ppi": 206
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2012/tablet-p/sony-tablet-p-scrapegsma-9246.json b/data/tablet/sony/2012/tablet-p/sony-tablet-p-scrapegsma-9246.json
index a9aab3d90a6a4..c3f3c4a2c507e 100644
--- a/data/tablet/sony/2012/tablet-p/sony-tablet-p-scrapegsma-9246.json
+++ b/data/tablet/sony/2012/tablet-p/sony-tablet-p-scrapegsma-9246.json
@@ -38,7 +38,6 @@
     "ppi": 206
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2012/xperia-tablet-s-3g/sony-xperia-tablet-s-3g-scrapegsma-9223.json b/data/tablet/sony/2012/xperia-tablet-s-3g/sony-xperia-tablet-s-3g-scrapegsma-9223.json
index 089df845c8a15..87ab09898d1de 100644
--- a/data/tablet/sony/2012/xperia-tablet-s-3g/sony-xperia-tablet-s-3g-scrapegsma-9223.json
+++ b/data/tablet/sony/2012/xperia-tablet-s-3g/sony-xperia-tablet-s-3g-scrapegsma-9223.json
@@ -38,7 +38,8 @@
     "ppi": 161
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2012/xperia-tablet-s/sony-xperia-tablet-s-scrapegsma-9224.json b/data/tablet/sony/2012/xperia-tablet-s/sony-xperia-tablet-s-scrapegsma-9224.json
index 8cfb3e01a08d6..70c075e7eb27f 100644
--- a/data/tablet/sony/2012/xperia-tablet-s/sony-xperia-tablet-s-scrapegsma-9224.json
+++ b/data/tablet/sony/2012/xperia-tablet-s/sony-xperia-tablet-s-scrapegsma-9224.json
@@ -36,7 +36,8 @@
     "ppi": 161
   },
   "storage_options_gb": [
-    1,
+    16,
+    32,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2013/xperia-tablet-z-lte/sony-xperia-tablet-z-lte-scrapegsma-9216.json b/data/tablet/sony/2013/xperia-tablet-z-lte/sony-xperia-tablet-z-lte-scrapegsma-9216.json
index 5542e888d52fb..387c69f7e015e 100644
--- a/data/tablet/sony/2013/xperia-tablet-z-lte/sony-xperia-tablet-z-lte-scrapegsma-9216.json
+++ b/data/tablet/sony/2013/xperia-tablet-z-lte/sony-xperia-tablet-z-lte-scrapegsma-9216.json
@@ -43,7 +43,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2013/xperia-tablet-z-wi-fi/sony-xperia-tablet-z-wi-fi-scrapegsma-9217.json b/data/tablet/sony/2013/xperia-tablet-z-wi-fi/sony-xperia-tablet-z-wi-fi-scrapegsma-9217.json
index 22cb7a09c98bc..dc8baf6b1e351 100644
--- a/data/tablet/sony/2013/xperia-tablet-z-wi-fi/sony-xperia-tablet-z-wi-fi-scrapegsma-9217.json
+++ b/data/tablet/sony/2013/xperia-tablet-z-wi-fi/sony-xperia-tablet-z-wi-fi-scrapegsma-9217.json
@@ -39,7 +39,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2014/xperia-z2-tablet-lte/sony-xperia-z2-tablet-lte-scrapegsma-9200.json b/data/tablet/sony/2014/xperia-z2-tablet-lte/sony-xperia-z2-tablet-lte-scrapegsma-9200.json
index 2994e025aee00..0e2b2b3c0dd78 100644
--- a/data/tablet/sony/2014/xperia-z2-tablet-lte/sony-xperia-z2-tablet-lte-scrapegsma-9200.json
+++ b/data/tablet/sony/2014/xperia-z2-tablet-lte/sony-xperia-z2-tablet-lte-scrapegsma-9200.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    3,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2014/xperia-z2-tablet-wi-fi/sony-xperia-z2-tablet-wi-fi-scrapegsma-9201.json b/data/tablet/sony/2014/xperia-z2-tablet-wi-fi/sony-xperia-z2-tablet-wi-fi-scrapegsma-9201.json
index 9044cff73b6bc..610f5d480b129 100644
--- a/data/tablet/sony/2014/xperia-z2-tablet-wi-fi/sony-xperia-z2-tablet-wi-fi-scrapegsma-9201.json
+++ b/data/tablet/sony/2014/xperia-z2-tablet-wi-fi/sony-xperia-z2-tablet-wi-fi-scrapegsma-9201.json
@@ -35,7 +35,7 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    3,
+    16,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2014/xperia-z3-tablet-compact/sony-xperia-z3-tablet-compact-scrapegsma-9186.json b/data/tablet/sony/2014/xperia-z3-tablet-compact/sony-xperia-z3-tablet-compact-scrapegsma-9186.json
index 80ce6038e0262..dacb7fb14925d 100644
--- a/data/tablet/sony/2014/xperia-z3-tablet-compact/sony-xperia-z3-tablet-compact-scrapegsma-9186.json
+++ b/data/tablet/sony/2014/xperia-z3-tablet-compact/sony-xperia-z3-tablet-compact-scrapegsma-9186.json
@@ -38,7 +38,6 @@
     "ppi": 283
   },
   "storage_options_gb": [
-    3,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2015/xperia-z4-tablet-lte/sony-xperia-z4-tablet-lte-scrapegsma-9179.json b/data/tablet/sony/2015/xperia-z4-tablet-lte/sony-xperia-z4-tablet-lte-scrapegsma-9179.json
index b052a618d9ce5..d6b9ad5f458d8 100644
--- a/data/tablet/sony/2015/xperia-z4-tablet-lte/sony-xperia-z4-tablet-lte-scrapegsma-9179.json
+++ b/data/tablet/sony/2015/xperia-z4-tablet-lte/sony-xperia-z4-tablet-lte-scrapegsma-9179.json
@@ -41,7 +41,6 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/sony/2015/xperia-z4-tablet-wifi/sony-xperia-z4-tablet-wifi-scrapegsma-9178.json b/data/tablet/sony/2015/xperia-z4-tablet-wifi/sony-xperia-z4-tablet-wifi-scrapegsma-9178.json
index 2731f8ca4cd0c..8a59a012d2046 100644
--- a/data/tablet/sony/2015/xperia-z4-tablet-wifi/sony-xperia-z4-tablet-wifi-scrapegsma-9178.json
+++ b/data/tablet/sony/2015/xperia-z4-tablet-wifi/sony-xperia-z4-tablet-wifi-scrapegsma-9178.json
@@ -38,7 +38,6 @@
     "ppi": 299
   },
   "storage_options_gb": [
-    3,
     32
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2012/smart-tab-ii-10/vodafone-smart-tab-ii-10-scrapegsma-10034.json b/data/tablet/vodafone/2012/smart-tab-ii-10/vodafone-smart-tab-ii-10-scrapegsma-10034.json
index 11ffeefee625e..5359d5895dcf2 100644
--- a/data/tablet/vodafone/2012/smart-tab-ii-10/vodafone-smart-tab-ii-10-scrapegsma-10034.json
+++ b/data/tablet/vodafone/2012/smart-tab-ii-10/vodafone-smart-tab-ii-10-scrapegsma-10034.json
@@ -38,7 +38,6 @@
     "ppi": 151
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2012/smart-tab-ii-7/vodafone-smart-tab-ii-7-scrapegsma-10035.json b/data/tablet/vodafone/2012/smart-tab-ii-7/vodafone-smart-tab-ii-7-scrapegsma-10035.json
index 08e4c784fba05..35d321c5a2cb3 100644
--- a/data/tablet/vodafone/2012/smart-tab-ii-7/vodafone-smart-tab-ii-7-scrapegsma-10035.json
+++ b/data/tablet/vodafone/2012/smart-tab-ii-7/vodafone-smart-tab-ii-7-scrapegsma-10035.json
@@ -38,7 +38,6 @@
     "ppi": 170
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2014/smart-tab-4g/vodafone-smart-tab-4g-scrapegsma-10023.json b/data/tablet/vodafone/2014/smart-tab-4g/vodafone-smart-tab-4g-scrapegsma-10023.json
index 97043584daa5e..3b49917febd58 100644
--- a/data/tablet/vodafone/2014/smart-tab-4g/vodafone-smart-tab-4g-scrapegsma-10023.json
+++ b/data/tablet/vodafone/2014/smart-tab-4g/vodafone-smart-tab-4g-scrapegsma-10023.json
@@ -38,7 +38,6 @@
     "ppi": 184
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2015/tab-prime-6/vodafone-tab-prime-6-scrapegsma-10019.json b/data/tablet/vodafone/2015/tab-prime-6/vodafone-tab-prime-6-scrapegsma-10019.json
index f2fbb215e366b..d3fbe0263be3d 100644
--- a/data/tablet/vodafone/2015/tab-prime-6/vodafone-tab-prime-6-scrapegsma-10019.json
+++ b/data/tablet/vodafone/2015/tab-prime-6/vodafone-tab-prime-6-scrapegsma-10019.json
@@ -38,7 +38,6 @@
     "ppi": 157
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2016/tab-prime-7/vodafone-tab-prime-7-scrapegsma-10011.json b/data/tablet/vodafone/2016/tab-prime-7/vodafone-tab-prime-7-scrapegsma-10011.json
index d9d5e1ff074b4..04a3780533300 100644
--- a/data/tablet/vodafone/2016/tab-prime-7/vodafone-tab-prime-7-scrapegsma-10011.json
+++ b/data/tablet/vodafone/2016/tab-prime-7/vodafone-tab-prime-7-scrapegsma-10011.json
@@ -38,7 +38,6 @@
     "ppi": 224
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/vodafone/2017/smart-tab-n8/vodafone-smart-tab-n8-scrapegsma-10007.json b/data/tablet/vodafone/2017/smart-tab-n8/vodafone-smart-tab-n8-scrapegsma-10007.json
index 7cbf1d10bd716..ff266d9fa4b51 100644
--- a/data/tablet/vodafone/2017/smart-tab-n8/vodafone-smart-tab-n8-scrapegsma-10007.json
+++ b/data/tablet/vodafone/2017/smart-tab-n8/vodafone-smart-tab-n8-scrapegsma-10007.json
@@ -38,7 +38,6 @@
     "ppi": 149
   },
   "storage_options_gb": [
-    2,
     16
   ],
   "connectivity": {
diff --git a/data/tablet/xiaomi/2014/mi-pad-7-9/xiaomi-mi-pad-7-9-scrapegsma-10235.json b/data/tablet/xiaomi/2014/mi-pad-7-9/xiaomi-mi-pad-7-9-scrapegsma-10235.json
index 631e3a2f49c2a..950cd3c4b3548 100644
--- a/data/tablet/xiaomi/2014/mi-pad-7-9/xiaomi-mi-pad-7-9-scrapegsma-10235.json
+++ b/data/tablet/xiaomi/2014/mi-pad-7-9/xiaomi-mi-pad-7-9-scrapegsma-10235.json
@@ -35,7 +35,7 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    2,
+    16,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/xiaomi/2015/mi-pad-2/xiaomi-mi-pad-2-scrapegsma-10221.json b/data/tablet/xiaomi/2015/mi-pad-2/xiaomi-mi-pad-2-scrapegsma-10221.json
index 49da72f5b8504..495b5dd791dec 100644
--- a/data/tablet/xiaomi/2015/mi-pad-2/xiaomi-mi-pad-2-scrapegsma-10221.json
+++ b/data/tablet/xiaomi/2015/mi-pad-2/xiaomi-mi-pad-2-scrapegsma-10221.json
@@ -35,7 +35,7 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    2,
+    16,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/xiaomi/2017/mi-pad-3/xiaomi-mi-pad-3-scrapegsma-10197.json b/data/tablet/xiaomi/2017/mi-pad-3/xiaomi-mi-pad-3-scrapegsma-10197.json
index a96289cdf2b73..1453fbc6b447d 100644
--- a/data/tablet/xiaomi/2017/mi-pad-3/xiaomi-mi-pad-3-scrapegsma-10197.json
+++ b/data/tablet/xiaomi/2017/mi-pad-3/xiaomi-mi-pad-3-scrapegsma-10197.json
@@ -35,7 +35,6 @@
     "ppi": 324
   },
   "storage_options_gb": [
-    4,
     64
   ],
   "connectivity": {
diff --git a/data/tablet/xolo/2013/play-tab-7-0/xolo-play-tab-7-0-scrapegsma-10315.json b/data/tablet/xolo/2013/play-tab-7-0/xolo-play-tab-7-0-scrapegsma-10315.json
index 8f423c312ee1a..f8010f07dcd94 100644
--- a/data/tablet/xolo/2013/play-tab-7-0/xolo-play-tab-7-0-scrapegsma-10315.json
+++ b/data/tablet/xolo/2013/play-tab-7-0/xolo-play-tab-7-0-scrapegsma-10315.json
@@ -35,7 +35,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {
diff --git a/data/tablet/xolo/2013/tab/xolo-tab-scrapegsma-10316.json b/data/tablet/xolo/2013/tab/xolo-tab-scrapegsma-10316.json
index 5db7aa6e9c0f2..c97c6296a23b6 100644
--- a/data/tablet/xolo/2013/tab/xolo-tab-scrapegsma-10316.json
+++ b/data/tablet/xolo/2013/tab/xolo-tab-scrapegsma-10316.json
@@ -38,7 +38,6 @@
     "ppi": 160
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/tablet/zte/2012/light-tab-3-v9s/zte-light-tab-3-v9s-scrapegsma-10612.json b/data/tablet/zte/2012/light-tab-3-v9s/zte-light-tab-3-v9s-scrapegsma-10612.json
index 6b08f0ef6d855..b93646908a39f 100644
--- a/data/tablet/zte/2012/light-tab-3-v9s/zte-light-tab-3-v9s-scrapegsma-10612.json
+++ b/data/tablet/zte/2012/light-tab-3-v9s/zte-light-tab-3-v9s-scrapegsma-10612.json
@@ -38,7 +38,6 @@
     "ppi": 216
   },
   "storage_options_gb": [
-    1,
     16
   ],
   "connectivity": {
diff --git a/data/watch/apple/2017/watch-series-3-aluminum/apple-watch-series-3-aluminum-scrapegsma-2359.json b/data/watch/apple/2017/watch-series-3-aluminum/apple-watch-series-3-aluminum-scrapegsma-2359.json
index b8cc8d8f4962e..2525ee55ed03c 100644
--- a/data/watch/apple/2017/watch-series-3-aluminum/apple-watch-series-3-aluminum-scrapegsma-2359.json
+++ b/data/watch/apple/2017/watch-series-3-aluminum/apple-watch-series-3-aluminum-scrapegsma-2359.json
@@ -38,6 +38,7 @@
     "ppi": 303
   },
   "storage_options_gb": [
+    8,
     16
   ],
   "connectivity": {
diff --git a/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-1082.json b/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-1082.json
index 68e55e68f7d5e..dc488e24095de 100644
--- a/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-1082.json
+++ b/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-1082.json
@@ -38,7 +38,6 @@
     "ppi": 348
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-199.json b/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-199.json
index 5f8efc6ff774c..0664d0b146142 100644
--- a/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-199.json
+++ b/data/watch/lg/2015/watch-urbane-lte/lg-watch-urbane-lte-scrapegsma-199.json
@@ -38,7 +38,6 @@
     "ppi": 348
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/watch/samsung/2018/galaxy-watch/samsung-galaxy-watch-scrapegsma-7867.json b/data/watch/samsung/2018/galaxy-watch/samsung-galaxy-watch-scrapegsma-7867.json
index 2107f351aa322..31868aaa210b3 100644
--- a/data/watch/samsung/2018/galaxy-watch/samsung-galaxy-watch-scrapegsma-7867.json
+++ b/data/watch/samsung/2018/galaxy-watch/samsung-galaxy-watch-scrapegsma-7867.json
@@ -38,7 +38,6 @@
     "ppi": 392
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/watch/samsung/2019/galaxy-watch-active2/samsung-galaxy-watch-active2-scrapegsma-1501.json b/data/watch/samsung/2019/galaxy-watch-active2/samsung-galaxy-watch-active2-scrapegsma-1501.json
index f348c8ddcb63b..f4a6370f75c14 100644
--- a/data/watch/samsung/2019/galaxy-watch-active2/samsung-galaxy-watch-active2-scrapegsma-1501.json
+++ b/data/watch/samsung/2019/galaxy-watch-active2/samsung-galaxy-watch-active2-scrapegsma-1501.json
@@ -44,7 +44,6 @@
     "ppi": 364
   },
   "storage_options_gb": [
-    1,
     4
   ],
   "connectivity": {
diff --git a/data/watch/xiaomi/2019/mi-watch/xiaomi-mi-watch-scrapegsma-832.json b/data/watch/xiaomi/2019/mi-watch/xiaomi-mi-watch-scrapegsma-832.json
index be4e50c32de64..ca283f8d7984b 100644
--- a/data/watch/xiaomi/2019/mi-watch/xiaomi-mi-watch-scrapegsma-832.json
+++ b/data/watch/xiaomi/2019/mi-watch/xiaomi-mi-watch-scrapegsma-832.json
@@ -38,7 +38,6 @@
     "ppi": 326
   },
   "storage_options_gb": [
-    1,
     8
   ],
   "connectivity": {