diff --git a/openbb_terminal/miscellaneous/data_sources_default.json b/openbb_terminal/miscellaneous/data_sources_default.json
index 3e34d30783a1..d0b9da7f165c 100644
--- a/openbb_terminal/miscellaneous/data_sources_default.json
+++ b/openbb_terminal/miscellaneous/data_sources_default.json
@@ -8,12 +8,12 @@
     "news": ["Feedparser", "NewsApi"],
     "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD", "Intrinio", "DataBento"],
     "th": {
-      "symbol": ["FinanceDatabase"],
       "open": ["Bursa"],
       "closed": ["Bursa"],
       "all": ["Bursa"],
       "exchange": ["Bursa"],
-      "holidays":["PandasMarketCalendars"]
+      "holidays":["PandasMarketCalendars"],
+      "symbol": ["FinanceDatabase"]
     },
     "options": {
       "unu": ["FDScanner"],
@@ -28,7 +28,6 @@
       "pcr": ["AlphaQuery"],
       "info": ["Barchart"],
       "chains": ["YahooFinance", "Tradier", "Nasdaq", "Intrinio"],
-      "eodchain":["Intrinio"],
       "oi": ["YahooFinance", "Tradier", "Nasdaq"],
       "vol": ["YahooFinance", "Tradier", "Nasdaq"],
       "voi": ["YahooFinance", "Tradier", "Nasdaq"],
@@ -39,6 +38,7 @@
       "parity": ["YahooFinance"],
       "binom": ["YahooFinance"],
       "greeks": ["YahooFinance"],
+      "eodchain":["Intrinio"],
       "pricing": {
         "add": [],
         "rmv": [],
@@ -65,7 +65,6 @@
       "active": ["YahooFinance"],
       "ulc": ["YahooFinance"],
       "asc": ["YahooFinance"],
-      "ford": ["Fidelity"],
       "arkord": ["CathiesArk"],
       "upcoming": ["SeekingAlpha"],
       "trending": ["SeekingAlpha"],
@@ -122,9 +121,6 @@
       "view": [],
       "set": [],
       "filter": ["OpenInsider"],
-      "stats": ["OpenInsider"],
-      "act": ["BusinessInsider"],
-      "lins": ["Finviz"],
       "lcb": ["OpenInsider"],
       "lpsb": ["OpenInsider"],
       "lit": ["OpenInsider"],
@@ -144,7 +140,10 @@
       "tippm": ["OpenInsider"],
       "tist": ["OpenInsider"],
       "tispw": ["OpenInsider"],
-      "tispm": ["OpenInsider"]
+      "tispm": ["OpenInsider"],
+      "stats": ["OpenInsider"],
+      "act": ["BusinessInsider"],
+      "lins": ["Finviz"]
     },
     "gov": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"],
@@ -164,11 +163,7 @@
       "headlines": ["FinBrain"],
       "snews": ["Finnhub"],
       "wsb": ["Reddit"],
-      "watchlist": ["Reddit"],
-      "popular": ["Reddit"],
       "spacc": ["Reddit"],
-      "spac": ["Reddit"],
-      "getdd": ["Reddit"],
       "redditsent": ["Reddit"],
       "trending": ["Stocktwits"],
       "stalker": ["Stocktwits"],
@@ -180,11 +175,7 @@
       "regions": ["Google"],
       "interest": ["Google"],
       "queries": ["Google"],
-      "rise": ["Google"],
-      "trend": ["SentimentInvestor"],
-      "hist": ["SentimentInvestor"],
-      "jcdr": ["JimCramer"],
-      "jctr": ["JimCramer"]
+      "rise": ["Google"]
     },
     "ca": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"],
@@ -210,6 +201,18 @@
     },
     "fa": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"],
+      "enterprise": ["FinancialModelingPrep", "YahooFinance"],
+      "overview": ["Finviz", "FinancialModelingPrep", "AlphaVantage", "YahooFinance"],
+      "divs": ["YahooFinance"],
+      "splits": ["YahooFinance"],
+      "rating": ["Finviz", "FinancialModelingPrep"],
+      "rot": ["Finnhub"],
+      "score": ["FinancialModelingPrep"],
+      "warnings": ["MarketWatch"],
+      "mgmt": ["BusinessInsider"],
+      "shrs": ["YahooFinance"],
+      "supplier": ["CSIMarket"],
+      "customer": ["CSIMarket"],
       "income": [
         "FinancialModelingPrep",
         "Polygon",
@@ -231,35 +234,20 @@
         "EODHD",
         "YahooFinance"
       ],
-      "overview": ["Finviz", "FinancialModelingPrep", "AlphaVantage", "YahooFinance"],
-      "mgmt": ["BusinessInsider"],
-      "analysis": ["Elect"],
-      "score": ["FinancialModelingPrep"],
-      "quote": ["FinancialModelingPrep"],
-      "enterprise": ["FinancialModelingPrep", "YahooFinance"],
+      "growth": ["FinancialModelingPrep"],
       "metrics": ["FinancialModelingPrep", "AlphaVantage"],
       "ratios": ["FinancialModelingPrep"],
-      "growth": ["FinancialModelingPrep"],
-      "revfc": ["SeekingAlpha"],
-      "epsfc": ["SeekingAlpha"],
-      "warnings": ["MarketWatch"],
-      "dcf": ["StockAnalysis"],
-      "dcfc": ["FinancialModelingPrep"],
-      "info": ["YahooFinance"],
-      "shrs": ["YahooFinance"],
-      "cal": ["YahooFinance"],
-      "divs": ["YahooFinance"],
-      "splits": ["YahooFinance"],
-      "earnings": ["AlphaVantage", "YahooFinance"],
-      "fraud": ["AlphaVantage"],
       "dupont": ["AlphaVantage"],
-      "rating": ["Finviz", "FinancialModelingPrep"],
-      "rot": ["Finnhub"],
-      "pt": ["BusinessInsider"],
-      "est": ["BusinessInsider"],
+      "fraud": ["AlphaVantage"],
       "sec": ["MarketWatch", "FinancialModelingPrep"],
-      "supplier": ["CSIMarket"],
-      "customer": ["CSIMarket"]
+      "analysis": ["Elect"],
+      "earnings": ["AlphaVantage", "YahooFinance"],
+      "epsfc": ["SeekingAlpha"],
+      "revfc": ["SeekingAlpha"],
+      "est": ["BusinessInsider"],
+      "pt": ["BusinessInsider"],
+      "dcf": ["StockAnalysis"],
+      "dcfc": ["FinancialModelingPrep"]
     },
     "bt": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"],
@@ -267,16 +255,13 @@
     },
     "ta": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"],
-      "tv": ["TradingView"],
       "recom": ["TradingView"],
-      "view": ["Finviz"],
-      "summary": ["FinBrain"]
+      "summary": ["FinBrain"],
+      "tv": ["TradingView"],
+      "view": ["Finviz"]
     },
     "qa": {
       "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"]
-    },
-    "pred": {
-      "load": ["YahooFinance", "AlphaVantage", "Polygon", "EODHD"]
     }
   },
   "crypto": {
@@ -336,6 +321,9 @@
       "ueat": ["BitQuery"],
       "ttcp": ["BitQuery"],
       "baas": ["BitQuery"],
+      "dt": ["Shroom"],
+      "ds": ["Shroom"],
+      "tvl": ["Shroom"],
       "address": ["Ethplorer"],
       "top": ["Ethplorer"],
       "balance": ["Ethplorer"],
@@ -344,14 +332,10 @@
       "holders": ["Ethplorer"],
       "th": ["Ethplorer"],
       "prices": ["Ethplorer"],
-      "tx": ["Ethplorer"],
-      "dt": ["Shroom"],
-      "ds": ["Shroom"],
-      "tvl": ["Shroom"]
+      "tx": ["Ethplorer"]
     },
     "defi": {
       "newsletter": ["Substack"],
-      "dpi": ["DeFiPulse"],
       "vaults": ["Coindix"],
       "tokens": ["TheGraph"],
       "stats": ["TheGraph"],
@@ -362,8 +346,6 @@
       "gdapps": ["DeFiLlama"],
       "stvl": ["DeFiLlama"],
       "dtvl": ["DeFiLlama"],
-      "aterra": ["TerraEngineer"],
-      "ayr": ["TerraEngineer"],
       "sinfo": ["TerraFCD"],
       "validators": ["TerraFCD"],
       "gacc": ["TerraFCD"],
@@ -391,6 +373,7 @@
       "gov": ["Messari"],
       "basic": ["CoinPaprika"],
       "stats": ["Coinbase"],
+      "desc": ["TokenTerminal"],
       "market": ["CoinGecko"],
       "mkt": ["CoinPaprika"],
       "ex": ["CoinPaprika"],
@@ -407,6 +390,7 @@
       "ps": ["CoinPaprika"],
       "mcapdom": ["Messari"],
       "mt": ["Messari"],
+      "funot": ["TokenTerminal"],
       "team": ["Messari"],
       "inv": ["Messari"],
       "tk": ["Messari"],
@@ -419,9 +403,7 @@
       "social": ["CoinGecko"],
       "score": ["CoinGecko"],
       "dev": ["CoinGecko"],
-      "gh": ["Santiment"],
-      "desc": ["TokenTerminal"],
-      "funot": ["TokenTerminal"]
+      "gh": ["Santiment"]
     },
     "ta": {
       "load": ["YahooFinance", "CoinGecko", "CCXT"],
@@ -429,28 +411,21 @@
     },
     "qa": {
       "load": ["YahooFinance", "CoinGecko", "CCXT"]
-    },
-    "pred": {
-      "load": ["YahooFinance", "CoinGecko", "CCXT"]
     }
   },
   "etf": {
     "search": ["FinanceDatabase", "StockAnalysis"],
     "load": ["YahooFinance"],
-    "overview": ["StockAnalysis"],
-    "holdings": ["StockAnalysis"],
-    "weights": ["FinancialModelingPrep"],
-    "news": ["NewsApi"],
-    "compare": ["StockAnalysis"],
     "disc": {
       "gainers": ["WallStreetJournal"],
       "decliners": ["WallStreetJournal"],
       "active": ["WallStreetJournal"]
     },
-    "screen": {
-      "screen": ["StockAnalysis"],
-      "sbc": ["FinanceDatabase"]
-    }
+    "overview": ["StockAnalysis"],
+    "holdings": ["StockAnalysis"],
+    "weights": ["FinancialModelingPrep"],
+    "news": ["NewsApi"],
+    "compare": ["StockAnalysis"]
   },
   "economy": {
     "overview": ["WallStreetJournal"],