diff --git a/LegitimateURLShortener.txt b/LegitimateURLShortener.txt
index 440215325..ddfc72f3d 100644
--- a/LegitimateURLShortener.txt
+++ b/LegitimateURLShortener.txt
@@ -1,5 +1,5 @@
 ! Title: ➗ Actually Legitimate URL Shortener Tool
-! Version: 16October2021v5-Beta
+! Version: 17October2021v2-Beta
 ! Expires: 2 days
 ! Description: In a world dominated by bit.ly, ad.fly, and several thousand other malware cover-up tools, this list reduces the length of URLs in a much more legitimate and transparent manner. Essentially, it automatically removes unnecessary $/& values from the URLs, making them easier to copy from the URL bar and pasting elsewhere as links. Enjoy.
 ! Homepage: https://github.com/DandelionSprout/adfilt/discussions/163
@@ -187,14 +187,6 @@ $removeparam=tracelog
 $removeparam=cardId
 ! https://metro.co.uk/2017/04/11/hubble-just-spotted-something-massive-coming-out-of-uranus-6567896/?ito=article.desktop.share.top.facebook
 $removeparam=ito
-! https://es.aliexpress.com/item/4000672272353.html?pvid=c4cdc770-f05a-4b7b-8a50-d8b81efff6c9&_t=gps-id:pcDetailBottomMoreThisSeller,scm-url:1007.13339.169870.0,pvid:c4cdc770-f05a-4b7b-8a50-d8b81efff6c9,tpp_buckets:668%230%23131923%230_668%23808%234094%23200_668%23888%233325%231_668%232846%238113%23646_668%232717%237558%23188_668%231000022185%231000066059%230_668%233468%2315617%23897
-||aliexpress.com/item/$removeparam=pvid
-||aliexpress.com^$removeparam=_t
-! https://es.aliexpress.com/item/4001349152860.html?gps-id=5547572&scm_id=1007.19201.130907.0&scm=1007.19201.130907.0&scm-url=1007.19201.130907.0
-||aliexpress.$removeparam=gps-id
-$removeparam=scm_id
-$removeparam=scm
-$removeparam=scm-url
 ! https://heathercoxrichardson.substack.com/p/a-new-narrative/comments?token=eyJ1c2VyX2lkIjo4Nzk4NDQyLCJwb3N0X2lkIjoyMTAzMDA1MiwiXyI6ImtkSWlHIiwiaWF0IjoxNjA2NzgxODUxLCJleHAiOjE2MDY3ODU0NTEsImlzcyI6InB1Yi0yMDUzMyIsInN1YiI6InBvc3QtcmVhY3Rpb24ifQ.tTGn1X5uPyuv73zXQEp7JY1cserdlOVCNwshJONiHRw
 ||substack.com^$removeparam=token
 ! https://www.bing.com/search?q=hello&form=QBLH&sp=-1&pq=hello&sc=8-5&qs=n&sk=&cvid=49B83A335B1C4884B71B2FAD4A8027A9 (02/03/2021)
@@ -423,7 +415,6 @@ $removeparam=/^aff_/
 $removeparam=SSAID
 $removeparam=affsrc
 $removeparam=/^cm_mmc/
-||aliexpress.com^$removeparam=initiative_id
 $removeparam=hsCtaTracking
 ||microsoft.com^$removeparam=headerid
 ||microsoft.com^$removeparam=/^AAAA/
@@ -555,11 +546,6 @@ $removeparam=Osocial
 ! https://www.nytimes.com/2008/12/16/sports/othersports/16beckey.html?adxnnl=1&adxnnlx=1257549224-XSk5v9i4LDrKlVwQmlgO8A&
 $removeparam=/^adxnnl/
 ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-972519
-||aliexpress.$removeparam=tt
-||aliexpress.$removeparam=terminal_id
-$removeparam=tmLog
-$removeparam=aem_p4p_detail
-$removeparam=algo_exp_id
 $removeparam=mkt_tok
 ||digikey.com^$removeparam=/^amp;/
 ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1004671
@@ -1083,18 +1069,6 @@ $removeparam=a_aid
 ||tokopedia.com^$removeparam=/^(source|trkid|whid)=/
 ! https://github.com/ClearURLs/Rules/issues/13
 ||mp.weixin.qq.com^$removeparam=/^(chksm|scene|xtrack|key|ascene|uin|devicetype|version|exportkey|pass_ticket)=/
-! https://campaign.aliexpress.com/wow/gcp/ae/channel/ae/accelerate/tupr?wh_weex=true&_immersiveMode=true&wx_navbar_hidden=true&wx_navbar_transparent=true&ignoreNavigationBar=true&wx_statusbar_hidden=true&wh_pid=ae/daily/ae/3c_daily/phones_accessories
-$removeparam=wx_header
-$removeparam=wx_navbar_hidden
-$removeparam=wx_navbar_transparent
-$removeparam=ignoreNavigationBar
-$removeparam=wx_statusbar_hidden
-! https://aliexpress.com/item/1005002402123565.html?fromRankId=3141134
-$removeparam=fromRankId
-! https://aliexpress.com/item/33014052863.html?pdp_ext_f=%7B%22ship_from%22:%22%22,%22sku_id%22:%2267107423525%22%7D&utparam=%7B%22process_id%22:%22401%22,%22x_object_type%22:%22product%22,%22pvid%22:%22df54ce03-45d0-42f5-a661-634290fe5f03%22,%22belongs%22:[%7B%22floor_id%22:%2222234693%22,%22id%22:%22782032%22,%22type%22:%22dataset%22%7D,%7B%22id_list%22:[%221000094891%22],%22type%22:%22gbrain%22%7D],%22scm%22:%221007.34914.242271.0%22,%22tpp_buckets%22:%2221669%230%23186385%230_21669%234190%2319162%23485_24914%230%23242271%238%22,%22x_object_id%22:%2233014052863%22%7D&__tppBottom=true
-||aliexpress.com^$removeparam=pdp_ext_f
-||aliexpress.com^$removeparam=utparam
-||aliexpress.com^$removeparam=__tppBottom
 ! https://www.flipkart.com/wildcraft-knight-mel-17-5-l-laptop-backpack/p/itmfejkcj45hnsdw?pid=BKPFEJKCFU49PCDE&lid=LSTBKPFEJKCFU49PCDEKYMJX4&marketplace=FLIPKART&store=reh%2F4d7%2Fak9&srno=b_1_1&otracker=hp_omu_Top%2BOffers%2BOn_3_13.dealCard.OMU_6NBH6T8TFQ5H_6&otracker1=hp_omu_WHITELISTED_neon%2Fmerchandising_Top%2BOffers%2BOn_NA_dealCard_cc_3_NA_view-all_6&fm=organic&iid=en_JRTu6S3VTYUNswfx2Vf%2BIxSVpVqAn%2BgBL%2F4egSHBpmeZwysjg95tdc%2B0VNBUu1uuBVLsn39nQeqsYzc7%2BsLNkQ%3D%3D&ppt=None&ppn=None&ssid=ooc70jk6kg0000001634312695177&cid=6NBH6T8TFQ5H
 $removeparam=otracker
 $removeparam=otracker1
@@ -1380,11 +1354,9 @@ $removeparam=share_link_id
 ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-974118
 ||tiktok.com^$removeparam=checksum
 
-! ——— Rules for international sites ——— !
-!
-! ——— Chinese ———
-!
-! ——— Baidu ———
+! ——— Rules for heavily covered international sites ——— !
+!! ——— PR-China ———
+!!! ——— Baidu ———
 ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1425521
 ||baidu.com^$removeparam=/^rsv/
 ||baidu.com^$removeparam=euri
@@ -1409,7 +1381,7 @@ $removeparam=share_link_id
 ||baidu.com^$removeparam=fr
 ||baidu.com^$removeparam=hisfilter
 
-! ——— Bilibili ———
+!!! ——— Bilibili ———
 ! https://github.com/uBlockOrigin/uAssets/pull/10010
 ||bilibili.com^$removeparam=/^current/
 ||bilibili.com^$removeparam=/^from/
@@ -1439,7 +1411,7 @@ $removeparam=share_link_id
 ! https://show.bilibili.com/platform/home.html?msource=pc_web
 ||bilibili.com^$removeparam=msource
 
-! ——— Sogou ———
+!!! ——— Sogou ———
 ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1421356
 ||sogou.com^$removeparam=_asf
 ||sogou.com^$removeparam=_ast
@@ -1453,8 +1425,22 @@ $removeparam=share_link_id
 ||sogou.com^$removeparam=sut
 ||sogou.com^$removeparam=w
 
-! ——— Mobile ——— !
+!!! ——— AliExpress ———
+! https://campaign.aliexpress.com/wow/gcp/ae/channel/ae/accelerate/tupr?wh_weex=true&_immersiveMode=true&wx_navbar_hidden=true&wx_navbar_transparent=true&ignoreNavigationBar=true&wx_statusbar_hidden=true&wh_pid=ae/daily/ae/3c_daily/phones_accessories
+$removeparam=wx_header
+$removeparam=wx_navbar_hidden
+$removeparam=wx_navbar_transparent
+$removeparam=ignoreNavigationBar
+$removeparam=wx_statusbar_hidden
+! https://aliexpress.com/item/1005002402123565.html?fromRankId=3141134
+$removeparam=fromRankId
+! https://aliexpress.com/item/33014052863.html?pdp_ext_f=%7B%22ship_from%22:%22%22,%22sku_id%22:%2267107423525%22%7D&utparam=%7B%22process_id%22:%22401%22,%22x_object_type%22:%22product%22,%22pvid%22:%22df54ce03-45d0-42f5-a661-634290fe5f03%22,%22belongs%22:[%7B%22floor_id%22:%2222234693%22,%22id%22:%22782032%22,%22type%22:%22dataset%22%7D,%7B%22id_list%22:[%221000094891%22],%22type%22:%22gbrain%22%7D],%22scm%22:%221007.34914.242271.0%22,%22tpp_buckets%22:%2221669%230%23186385%230_21669%234190%2319162%23485_24914%230%23242271%238%22,%22x_object_id%22:%2233014052863%22%7D&__tppBottom=true
+||aliexpress.com^$removeparam=pdp_ext_f
+||aliexpress.com^$removeparam=utparam
+||aliexpress.com^$removeparam=__tppBottom
+
 !#if !env_mobile
+! ——— Mobile ——— !
 ! ——— Entries mostly dedicated to maximising image sizes (thus poorly suited for phones) ———
 ! https://sproutsluckycorner.files.wordpress.com/2019/12/ring-fit-adventure-smoothies-1.png?w=600 (Shows the actual raw image instead of a promotion page; 25/11/2020)
 $removeparam=w,domain=files.wordpress.com|store.playstation.com|s-microsoft.com|store-images.microsoft.com