Release 2.13.0 (#2514 )

Make holdings request only once (#2453 )
* Make holdings request only once * Update changelog
2023-10-20 08:24:49 +02:00 · 2023-10-20 08:21:23 +02:00 · 2023-10-20 08:18:34 +02:00 · 2023-10-19 17:13:40 +02:00 · 2023-10-19 16:58:01 +02:00 · 2023-10-19 15:51:31 +02:00
482 changed files with 65231 additions and 21493 deletions
--- a/.env.example
+++ b/.env.example
@ -11,6 +11,5 @@ POSTGRES_USER=user
 POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>

 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
-ALPHA_VANTAGE_API_KEY=
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@ -33,4 +33,4 @@ jobs:
        run: yarn test

      - name: Build application
-        run: yarn build:all
+        run: yarn build:production
--- a/.prettierrc
+++ b/.prettierrc
@ -9,6 +9,7 @@
  ],
  "attributeSort": "ASC",
  "endOfLine": "auto",
+  "plugins": ["prettier-plugin-organize-attributes"],
  "printWidth": 80,
  "singleQuote": true,
  "tabWidth": 2,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,425 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## 2.13.0 - 2023-10-20
+
+### Added
+
+- Added a chart to the account detail dialog
+- Added an `i18n` service to query `messages.*.xlf` files on the server
+
+### Changed
+
+- Changed the users table in the admin control panel to an `@angular/material` data table
+- Improved the styling of the membership status
+
+### Fixed
+
+- Fixed an issue where holdings were requested twice from the server
+
+## 2.12.0 - 2023-10-17
+
+### Added
+
+- Added the endpoint `GET api/v1/account/:id/balances` which provides historical cash balances
+- Added support to search for an asset profile by `isin`, `name` and `symbol` as an administrator (experimental)
+- Added support for creating asset profiles with `MANUAL` data source
+
+### Changed
+
+- Changed the checkboxes to slide toggles in the user settings of the user account page
+- Extended the `copy-assets` `Nx` target to copy the locales to the server’s assets
+- Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `5.2.1` to `8.3`
+
+### Fixed
+
+- Displayed the transfer cash balance button based on a permission
+- Fixed the biometric authentication
+- Fixed the query to get asset profiles that match both the `dataSource` and `symbol` values
+
+## 2.11.0 - 2023-10-14
+
+### Added
+
+- Added support to transfer a part of the cash balance from one to another account
+- Extended the markets overview by benchmarks (date of last all time high)
+- Added support to import historical market data in the admin control panel
+
+### Changed
+
+- Harmonized the style of the create button on the page for granting and revoking public access to share the portfolio
+- Improved the language localization for German (`de`)
+- Upgraded `prisma` from version `5.3.1` to `5.4.2`
+
+### Fixed
+
+- Fixed `FEE` and `INTEREST` types in the activities import of `csv` files
+- Fixed the displayed currency of the cash balance in the create or update account dialog
+
+## 2.10.0 - 2023-10-09
+
+### Added
+
+- Supported enter key press to submit the form of the create or update access dialog
+
+### Changed
+
+- Improved the display of the results in the search for a holding
+- Changed the queue jobs view in the admin control panel to an `@angular/material` data table
+- Improved the symbol conversion in the _EOD Historical Data_ service
+
+## 2.9.0 - 2023-10-08
+
+### Added
+
+- Added support to search for a holding by `isin`, `name` and `symbol` (experimental)
+- Added support for notes in the activities import
+- Added support to search in the platform selector of the create or update account dialog
+- Added support for a search query in the portfolio position endpoint
+- Added the application version to the endpoint `GET api/v1/admin`
+- Introduced a carousel component for the testimonial section on the landing page
+
+### Changed
+
+- Displayed the link to the markets overview on the home page without any permission
+
+### Fixed
+
+- Fixed the style of the active features page in the navigation on desktop
+
+## 2.8.0 - 2023-10-03
+
+### Added
+
+- Supported enter key press to submit the form of the create or update account dialog
+- Added the application version to the admin control panel
+- Added pagination parameters (`skip`, `take`) to the endpoint `GET api/v1/order`
+
+### Changed
+
+- Harmonized the settings icon of the user account page
+- Improved the usability to set an asset profile as a benchmark
+- Reload platforms after making a change in the admin control panel
+- Reload tags after making a change in the admin control panel
+
+### Fixed
+
+- Fixed the sidebar navigation on the user account page
+
+## 2.7.0 - 2023-09-30
+
+### Added
+
+- Added a new static portfolio analysis rule: Emergency fund setup
+- Added tabs to the user account page
+
+### Changed
+
+- Set up the _Inter_ font family
+- Upgraded `yahoo-finance2` from version `2.7.0` to `2.8.0`
+
+### Fixed
+
+- Fixed a link on the features page
+
+## 2.6.0 - 2023-09-26
+
+### Added
+
+- Added the management of tags in the admin control panel
+- Added a blog post: _Hacktoberfest 2023_
+
+### Changed
+
+- Upgraded `prettier` from version `3.0.2` to `3.0.3`
+- Upgraded `yahoo-finance2` from version `2.5.0` to `2.7.0`
+
+## 2.5.0 - 2023-09-23
+
+### Added
+
+- Added support for translated activity types in the activities table
+- Added support for dates in `DD.MM.YYYY` format in the activities import
+- Set up the language localization for Türkçe (`tr`)
+
+### Changed
+
+- Skipped creating queue jobs for asset profiles with `MANUAL` data source on creating a new activity
+
+### Fixed
+
+- Fixed an issue with the cash position in the holdings table
+
+## 2.4.0 - 2023-09-19
+
+### Added
+
+- Added support for interest on account level (experimental)
+
+### Changed
+
+- Improved the preselected currency based on the account’s currency in the create or edit activity dialog
+- Unlocked the experimental features setting for all users
+- Upgraded `prisma` from version `5.2.0` to `5.3.1`
+
+### Fixed
+
+- Fixed a memory leak related to the server’s timezone (behind UTC) in the data gathering
+
+## 2.3.0 - 2023-09-17
+
+### Added
+
+- Added support for fees on account level (experimental)
+
+### Fixed
+
+- Fixed the export functionality for liabilities
+
+## 2.2.0 - 2023-09-17
+
+### Added
+
+- Introduced a sidebar navigation on desktop
+
+### Changed
+
+- Improved the style of the system message
+- Upgraded _Postgres_ from version `12` to `15` in the `docker-compose` files
+
+## 2.1.0 - 2023-09-15
+
+### Added
+
+- Added support to drop a file in the import activities dialog
+- Added a timeout to all data source requests
+
+### Changed
+
+- Harmonized the style of the user interface for granting and revoking public access to share the portfolio
+- Removed the account type from the user interface as a preparation to remove it from the `Account` database schema
+- Improved the logger output of the info service
+- Harmonized the logger output: `<symbol> (<dataSource>)`
+- Improved the language localization for German (`de`)
+- Improved the language localization for Italian (`it`)
+- Improved the language localization for Dutch (`nl`)
+- Improved the read-only mode
+
+### Fixed
+
+- Fixed the timeout in _EOD Historical Data_ requests
+- Fixed an issue with the portfolio summary caused by the language localization for Dutch (`nl`)
+
+## 2.0.0 - 2023-09-09
+
+### Added
+
+- Added support for the cryptocurrency _CyberConnect_
+- Added a blog post: _Announcing Ghostfolio 2.0_
+
+### Changed
+
+- **Breaking Change**: Removed the deprecated environment variable `BASE_CURRENCY`
+- Improved the validation in the activities import
+- Deactivated _Internet Identity_ as a social login provider for the account registration
+- Improved the language localization for German (`de`)
+- Refreshed the cryptocurrencies list
+- Changed the version in the `docker-compose` files from `3.7` to `3.9`
+- Upgraded `yahoo-finance2` from version `2.4.4` to `2.5.0`
+
+### Fixed
+
+- Fixed an issue in the _Yahoo Finance_ data enhancer where countries and sectors have been removed
+
+## 1.305.0 - 2023-09-03
+
+### Added
+
+- Added _Hacker News_ to the _As seen in_ section on the landing page
+
+### Changed
+
+- Shortened the page titles
+- Improved the language localization for German (`de`)
+- Upgraded `prisma` from version `4.16.2` to `5.2.0`
+- Upgraded `replace-in-file` from version `6.3.5` to `7.0.1`
+- Upgraded `yahoo-finance2` from version `2.4.3` to `2.4.4`
+
+### Fixed
+
+- Fixed the alignment in the header navigation
+- Fixed the alignment in the menu of the impersonation mode
+
+## 1.304.0 - 2023-08-27
+
+### Added
+
+- Added health check endpoints for data enhancers
+
+### Changed
+
+- Upgraded `Nx` from version `16.7.2` to `16.7.4`
+- Upgraded `prettier` from version `2.8.4` to `3.0.2`
+
+## 1.303.0 - 2023-08-23
+
+### Added
+
+- Added a blog post: _Ghostfolio joins OSS Friends_
+
+### Changed
+
+- Refreshed the cryptocurrencies list
+- Improved the _OSS Friends_ page
+
+### Fixed
+
+- Fixed an issue with the _Trackinsight_ data enhancer for asset profile data
+
+## 1.302.0 - 2023-08-20
+
+### Changed
+
+- Improved the language localization for German (`de`)
+- Upgraded `angular` from version `16.1.8` to `16.2.1`
+- Upgraded `Nx` from version `16.6.0` to `16.7.2`
+
+## 1.301.1 - 2023-08-19
+
+### Added
+
+- Added the data export feature to the user account page
+- Added a currencies preset to the historical market data table of the admin control panel
+- Added the _OSS Friends_ page
+
+### Changed
+
+- Improved the localized meta data in `html` files
+
+### Fixed
+
+- Fixed the rows with cash positions in the holdings table
+- Fixed an issue with the date parsing in the historical market data editor of the admin control panel
+
+## 1.300.0 - 2023-08-11
+
+### Added
+
+- Added more durations in the coupon system
+
+### Changed
+
+- Migrated the remaining requests from `bent` to `got`
+
+## 1.299.1 - 2023-08-10
+
+### Changed
+
+- Optimized the activities import by allowing a different currency than the asset’s official one
+- Added a timeout to the _EOD Historical Data_ requests
+- Migrated the requests from `bent` to `got` in the _EOD Historical Data_ service
+
+### Fixed
+
+- Fixed the editing of the emergency fund
+- Fixed the historical data gathering interval for asset profiles used as benchmarks having activities
+
+## 1.298.0 - 2023-08-06
+
+### Changed
+
+- Improved the language localization for German (`de`)
+- Upgraded `ng-extract-i18n-merge` from version `2.6.0` to `2.7.0`
+- Upgraded `Nx` from version `16.5.5` to `16.6.0`
+
+### Fixed
+
+- Fixed the styles of various components (card, progress, tab) after the upgrade to `@angular/material` `16`
+
+## 1.297.4 - 2023-08-05
+
+### Added
+
+- Added the footer to the public page
+- Added a `copy-assets` `Nx` target to the client build
+
+### Changed
+
+- Improved the alignment of the region percentages on the allocations page
+- Improved the alignment of the region percentages on the public page
+- Improved the redirection of the home page to the localized home page
+- Improved the language localization for German (`de`)
+- Upgraded `angular` from version `15.2.5` to `16.1.8`
+- Upgraded `nestjs` from version `9.1.4` to `10.1.3`
+- Upgraded `Nx` from version `16.0.3` to `16.5.5`
+
+## 1.296.0 - 2023-08-01
+
+### Changed
+
+- Optimized the validation in the activities import by reducing the list to unique asset profiles
+- Optimized the data gathering in the activities import
+
+## 1.295.0 - 2023-07-30
+
+### Added
+
+- Added a step by step introduction for new users
+
+### Fixed
+
+- Removed the _Stay signed in_ setting on _Sign in with fingerprint_ activation
+
+## 1.294.0 - 2023-07-29
+
+### Changed
+
+- Extended the allocations by market chart on the allocations page by unavailable data
+
+### Fixed
+
+- Considered liabilities in the total account value calculation
+
+## 1.293.0 - 2023-07-26
+
+### Added
+
+- Added error handling for the _Redis_ connections to keep the app running if the connection fails
+
+### Changed
+
+- Set the `lastmod` dates of `sitemap.xml` dynamically
+
+### Fixed
+
+- Fixed the missing values in the holdings table
+- Fixed the `no such file or directory` error caused by the missing `favicon.ico` file
+
+## 1.292.0 - 2023-07-24
+
+### Added
+
+- Introduced the allocations by market chart on the allocations page
+
+### Changed
+
+- Upgraded `yahoo-finance2` from version `2.4.2` to `2.4.3`
+
+### Fixed
+
+- Fixed an issue in the public page
+
+## 1.291.0 - 2023-07-23
+
+### Added
+
+- Broken down the emergency fund by cash and assets
+- Added support for account balance time series
+
+### Changed
+
+- Renamed queries to presets in the historical market data table of the admin control panel
+
 ## 1.290.0 - 2023-07-16

 ### Added
@ -407,7 +826,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Persisted today's market data continuously
+- Persisted today’s market data continuously

 ### Fixed

@ -492,7 +911,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Changed the slide toggles to checkboxes on the account page
+- Changed the slide toggles to checkboxes on the user account page
 - Changed the slide toggles to checkboxes in the admin control panel
 - Increased the density of the theme
 - Migrated the style of various components to `@angular/material` `15` (mdc)
@ -641,7 +1060,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed

 - Filtered activities with type `ITEM` from search results
- Considered the user's language in the _Stripe_ checkout
+- Considered the user’s language in the _Stripe_ checkout
 - Upgraded the _Stripe_ dependencies
 - Upgraded `twitter-api-v2` from version `1.10.3` to `1.14.2`

@ -1054,7 +1473,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Improved the language selector on the account page
+- Improved the language selector on the user account page
 - Improved the wording in the _X-ray_ section (net worth instead of investment)
 - Extended the asset profile details dialog in the admin control panel
 - Updated the browserslist database
@ -1299,7 +1718,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Added

- Set up the language localization for Italiano (`it`)
+- Set up the language localization for Italian (`it`)
 - Extended the landing page

 ## 1.195.0 - 20.09.2022
@ -1472,7 +1891,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Added

- Added a language selector to the account page
+- Added a language selector to the user account page
 - Added support for translated labels in the value component

 ### Changed
@ -1801,7 +2220,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Added

- Added the user id to the account page
+- Added the user id to the user account page
 - Added a new view with jobs of the queue to the admin control panel

 ### Changed
@ -2315,7 +2734,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed

 - Moved the countries and sectors charts in the position detail dialog
- Distinguished today's data point of historical data in the admin control panel
+- Distinguished today’s data point of historical data in the admin control panel
 - Restructured the server modules

 ### Fixed
@ -2722,7 +3141,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - Supported the management of additional currencies in the admin control panel
 - Introduced the system message
- Introduced the read only mode
+- Introduced the read-only mode

 ### Changed

@ -3456,7 +3875,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed

 - Respected the cash balance on the analysis page
- Improved the settings selectors on the account page
+- Improved the settings selectors on the user account page
 - Harmonized the slogan to "Open Source Wealth Management Software"

 ### Fixed
@ -3922,7 +4341,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added

 - Added a gradient to the line charts
- Added a selector to set the base currency on the account page
+- Added a selector to set the base currency on the user account page

 ## 0.81.0 - 06.04.2021

@ -4236,7 +4655,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Added the membership status to the account page
+- Added the membership status to the user account page

 ### Fixed

--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@ -18,6 +18,12 @@

 ### Prisma

+#### Access database via GUI
+
+Run `yarn database:gui`
+
+https://www.prisma.io/studio
+
 #### Synchronize schema with database for prototyping

 Run `yarn database:push`
--- a/4
+++ b/4
@ -33,7 +33,7 @@ COPY ./tsconfig.base.json tsconfig.base.json
 COPY ./libs libs
 COPY ./apps apps

-RUN yarn build:all
+RUN yarn build:production

 # Prepare the dist image with additional node_modules
 WORKDIR /ghostfolio/dist/apps/api
@ -58,4 +58,4 @@ RUN apt update && apt install -y \
 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
 WORKDIR /ghostfolio/apps/api
 EXPOSE ${PORT:-3333}
-CMD [  "yarn", "start:prod" ]
+CMD [ "yarn", "start:production" ]
--- a/README.md
+++ b/README.md
@ -13,6 +13,8 @@
 [![Shield: Contributions Welcome](https://img.shields.io/badge/Contributions-Welcome-orange.svg)](#contributing)
 [![Shield: License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)

+New: [Ghostfolio 2.0](https://ghostfol.io/en/blog/2023/09/ghostfolio-2)
+
 </div>

 **Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions. The software is designed for personal use in continuous operation.
@ -25,7 +27,7 @@

 ## Ghostfolio Premium

-Our official **[Ghostfolio Premium](https://ghostfol.io/en/pricing)** cloud offering is the easiest way to get started. Due to the time it saves, this will be the best option for most people. The revenue is used for covering the hosting costs.
+Our official **[Ghostfolio Premium](https://ghostfol.io/en/pricing)** cloud offering is the easiest way to get started. Due to the time it saves, this will be the best option for most people. Revenue is used to cover the costs of the hosting infrastructure and to fund ongoing development.

 If you prefer to run Ghostfolio on your own infrastructure, please find further instructions in the [Self-hosting](#self-hosting) section.

@ -136,9 +138,9 @@ docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`  
   At each start, the container will automatically apply the database schema migrations if needed.

-### Run with _Unraid_ (Community)
+### Home Server Systems (Community)

-Please follow the instructions of the Ghostfolio [Unraid Community App](https://unraid.net/community/apps?q=ghostfolio).
+Ghostfolio is available for various home server systems, including [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).

 ## Development

@ -153,7 +155,6 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://
 ### Setup

 1. Run `yarn install`
-1. Run `yarn build:dev` to build the source code including the assets
 1. Run `docker-compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
 1. Run `yarn database:setup` to initialize the database schema
 1. Start the server and the client (see [_Development_](#Development))
@ -263,7 +264,9 @@ Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TO

 ## Community Projects

- [ghostfolio-cli](https://github.com/DerAndereJohannes/ghostfolio-cli): Command-line interface to access your portfolio
+Discover a variety of community projects for Ghostfolio: https://github.com/topics/ghostfolio
+
+Are you building your own project? Add the `ghostfolio` topic to your _GitHub_ repository to get listed as well. [Learn more →](https://docs.github.com/en/articles/classifying-your-repository-with-topics)

 ## Contributing

--- a/apps/api/project.json
+++ b/apps/api/project.json
@ -33,7 +33,7 @@
      "outputs": ["{options.outputPath}"]
    },
    "serve": {
-      "executor": "@nx/node:node",
+      "executor": "@nx/js:node",
      "options": {
        "buildTarget": "api:build"
      }
--- a/apps/api/src/app/access/create-access.dto.ts
+++ b/apps/api/src/app/access/create-access.dto.ts
@ -8,4 +8,8 @@ export class CreateAccessDto {
  @IsOptional()
  @IsString()
  granteeUserId?: string;
+
+  @IsOptional()
+  @IsString()
+  type?: 'PUBLIC';
 }
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@ -1,8 +1,12 @@
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
 import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
-import { Accounts } from '@ghostfolio/common/interfaces';
+import {
+  AccountBalancesResponse,
+  Accounts
+} from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type {
  AccountWithValue,
@ -29,11 +33,13 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { AccountService } from './account.service';
 import { CreateAccountDto } from './create-account.dto';
+import { TransferBalanceDto } from './transfer-balance.dto';
 import { UpdateAccountDto } from './update-account.dto';

@Controller('account')
 export class AccountController {
  public constructor(
+    private readonly accountBalanceService: AccountBalanceService,
    private readonly accountService: AccountService,
    private readonly impersonationService: ImpersonationService,
    private readonly portfolioService: PortfolioService,
@ -115,6 +121,18 @@ export class AccountController {
    return accountsWithAggregations.accounts[0];
  }

+  @Get(':id/balances')
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
+  public async getAccountBalancesById(
+    @Param('id') id: string
+  ): Promise<AccountBalancesResponse> {
+    return this.accountBalanceService.getAccountBalances({
+      accountId: id,
+      userId: this.request.user.id
+    });
+  }
+
  @Post()
  @UseGuards(AuthGuard('jwt'))
  public async createAccount(
@ -154,6 +172,58 @@ export class AccountController {
    }
  }

+  @Post('transfer-balance')
+  @UseGuards(AuthGuard('jwt'))
+  public async transferAccountBalance(
+    @Body() { accountIdFrom, accountIdTo, balance }: TransferBalanceDto
+  ) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateAccount)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const accountsOfUser = await this.accountService.getAccounts(
+      this.request.user.id
+    );
+
+    const currentAccountIds = accountsOfUser.map(({ id }) => {
+      return id;
+    });
+
+    if (
+      ![accountIdFrom, accountIdTo].every((accountId) => {
+        return currentAccountIds.includes(accountId);
+      })
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.NOT_FOUND),
+        StatusCodes.NOT_FOUND
+      );
+    }
+
+    const { currency } = accountsOfUser.find(({ id }) => {
+      return id === accountIdFrom;
+    });
+
+    await this.accountService.updateAccountBalance({
+      currency,
+      accountId: accountIdFrom,
+      amount: -balance,
+      userId: this.request.user.id
+    });
+
+    await this.accountService.updateAccountBalance({
+      currency,
+      accountId: accountIdTo,
+      amount: balance,
+      userId: this.request.user.id
+    });
+  }
+
  @Put(':id')
  @UseGuards(AuthGuard('jwt'))
  public async update(@Param('id') id: string, @Body() data: UpdateAccountDto) {
--- a/apps/api/src/app/account/account.module.ts
+++ b/apps/api/src/app/account/account.module.ts
@ -1,6 +1,7 @@
 import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
@ -15,6 +16,7 @@ import { AccountService } from './account.service';
  controllers: [AccountController],
  exports: [AccountService],
  imports: [
+    AccountBalanceModule,
    ConfigurationModule,
    DataProviderModule,
    ExchangeRateDataModule,
--- a/apps/api/src/app/account/account.service.ts
+++ b/apps/api/src/app/account/account.service.ts
@ -1,3 +1,4 @@
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { Filter } from '@ghostfolio/common/interfaces';
@ -11,16 +12,21 @@ import { CashDetails } from './interfaces/cash-details.interface';
@Injectable()
 export class AccountService {
  public constructor(
+    private readonly accountBalanceService: AccountBalanceService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService
  ) {}

-  public async account(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput
-  ): Promise<Account | null> {
-    return this.prismaService.account.findUnique({
-      where: accountWhereUniqueInput
+  public async account({
+    id_userId
+  }: Prisma.AccountWhereUniqueInput): Promise<Account | null> {
+    const { id, userId } = id_userId;
+
+    const [account] = await this.accounts({
+      where: { id, userId }
    });
+
+    return account;
  }

  public async accountWithOrders(
@ -50,9 +56,11 @@ export class AccountService {
      Platform?: Platform;
    })[]
  > {
-    const { include, skip, take, cursor, where, orderBy } = params;
+    const { include = {}, skip, take, cursor, where, orderBy } = params;

-    return this.prismaService.account.findMany({
+    include.balances = { orderBy: { date: 'desc' }, take: 1 };
+
+    const accounts = await this.prismaService.account.findMany({
      cursor,
      include,
      orderBy,
@ -60,15 +68,36 @@ export class AccountService {
      take,
      where
    });
+
+    return accounts.map((account) => {
+      account = { ...account, balance: account.balances[0]?.value ?? 0 };
+
+      delete account.balances;
+
+      return account;
+    });
  }

  public async createAccount(
    data: Prisma.AccountCreateInput,
    aUserId: string
  ): Promise<Account> {
-    return this.prismaService.account.create({
+    const account = await this.prismaService.account.create({
      data
    });
+
+    await this.prismaService.accountBalance.create({
+      data: {
+        Account: {
+          connect: {
+            id_userId: { id: account.id, userId: aUserId }
+          }
+        },
+        value: data.balance
+      }
+    });
+
+    return account;
  }

  public async deleteAccount(
@ -80,7 +109,7 @@ export class AccountService {
    });
  }

-  public async getAccounts(aUserId: string) {
+  public async getAccounts(aUserId: string): Promise<Account[]> {
    const accounts = await this.accounts({
      include: { Order: true, Platform: true },
      orderBy: { name: 'asc' },
@ -167,6 +196,18 @@ export class AccountService {
    aUserId: string
  ): Promise<Account> {
    const { data, where } = params;
+
+    await this.prismaService.accountBalance.create({
+      data: {
+        Account: {
+          connect: {
+            id_userId: where.id_userId
+          }
+        },
+        value: <number>data.balance
+      }
+    });
+
    return this.prismaService.account.update({
      data,
      where
@ -177,13 +218,13 @@ export class AccountService {
    accountId,
    amount,
    currency,
-    date,
+    date = new Date(),
    userId
  }: {
    accountId: string;
    amount: number;
    currency: string;
-    date: Date;
+    date?: Date;
    userId: string;
  }) {
    const { balance, currency: currencyOfAccount } = await this.account({
@ -202,16 +243,17 @@ export class AccountService {
      );

    if (amountInCurrencyOfAccount) {
-      await this.prismaService.account.update({
-        data: {
-          balance: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
-        },
-        where: {
-          id_userId: {
-            userId,
-            id: accountId
+      await this.accountBalanceService.createAccountBalance({
+        date,
+        Account: {
+          connect: {
+            id_userId: {
+              userId,
+              id: accountId
+            }
          }
-        }
+        },
+        value: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
      });
    }
  }
--- a/apps/api/src/app/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@ -10,8 +10,9 @@ import {
 import { isString } from 'lodash';

 export class CreateAccountDto {
+  @IsOptional()
  @IsString()
-  accountType: AccountType;
+  accountType?: AccountType;

  @IsNumber()
  balance: number;
--- a/apps/api/src/app/account/transfer-balance.dto.ts
+++ b/apps/api/src/app/account/transfer-balance.dto.ts
@ -0,0 +1,12 @@
+import { IsNumber, IsString } from 'class-validator';
+
+export class TransferBalanceDto {
+  @IsString()
+  accountIdFrom: string;
+
+  @IsString()
+  accountIdTo: string;
+
+  @IsNumber()
+  balance: number;
+}
--- a/apps/api/src/app/account/update-account.dto.ts
+++ b/apps/api/src/app/account/update-account.dto.ts
@ -10,8 +10,9 @@ import {
 import { isString } from 'lodash';

 export class UpdateAccountDto {
+  @IsOptional()
  @IsString()
-  accountType: AccountType;
+  accountType?: AccountType;

  @IsNumber()
  balance: number;
--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@ -1,22 +1,22 @@
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
+import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import {
-  DEFAULT_PAGE_SIZE,
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import {
  AdminData,
  AdminMarketData,
  AdminMarketDataDetails,
-  EnhancedSymbolProfile,
-  Filter
+  EnhancedSymbolProfile
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type {
-  MarketDataQuery,
+  MarketDataPreset,
  RequestWithUser
 } from '@ghostfolio/common/types';
 import {
@ -37,17 +37,19 @@ import {
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { DataSource, MarketData, Prisma, SymbolProfile } from '@prisma/client';
-import { isDate } from 'date-fns';
+import { isDate, parseISO } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { AdminService } from './admin.service';
 import { UpdateAssetProfileDto } from './update-asset-profile.dto';
+import { UpdateBulkMarketDataDto } from './update-bulk-market-data.dto';
 import { UpdateMarketDataDto } from './update-market-data.dto';

@Controller('admin')
 export class AdminController {
  public constructor(
    private readonly adminService: AdminService,
+    private readonly apiService: ApiService,
    private readonly dataGatheringService: DataGatheringService,
    private readonly marketDataService: MarketDataService,
    @Inject(REQUEST) private readonly request: RequestWithUser
@ -116,7 +118,7 @@ export class AdminController {
          name: GATHER_ASSET_PROFILE_PROCESS,
          opts: {
            ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
          }
        };
      })
@ -152,7 +154,7 @@ export class AdminController {
          name: GATHER_ASSET_PROFILE_PROCESS,
          opts: {
            ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
          }
        };
      })
@ -185,7 +187,7 @@ export class AdminController {
      name: GATHER_ASSET_PROFILE_PROCESS,
      opts: {
        ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: `${dataSource}-${symbol}`
+        jobId: getAssetProfileIdentifier({ dataSource, symbol })
      }
    });
  }
@ -232,7 +234,7 @@ export class AdminController {
      );
    }

-    const date = new Date(dateString);
+    const date = parseISO(dateString);

    if (!isDate(date)) {
      throw new HttpException(
@ -252,7 +254,8 @@ export class AdminController {
  @UseGuards(AuthGuard('jwt'))
  public async getMarketData(
    @Query('assetSubClasses') filterByAssetSubClasses?: string,
-    @Query('queryId') queryId?: MarketDataQuery,
+    @Query('presetId') presetId?: MarketDataPreset,
+    @Query('query') filterBySearchQuery?: string,
    @Query('skip') skip?: number,
    @Query('sortColumn') sortColumn?: string,
    @Query('sortDirection') sortDirection?: Prisma.SortOrder,
@ -270,20 +273,14 @@ export class AdminController {
      );
    }

-    const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...assetSubClasses.map((assetSubClass) => {
-        return <Filter>{
-          id: assetSubClass,
-          type: 'ASSET_SUB_CLASS'
-        };
-      })
-    ];
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAssetSubClasses,
+      filterBySearchQuery
+    });

    return this.adminService.getMarketData({
      filters,
-      queryId,
+      presetId,
      sortColumn,
      sortDirection,
      skip: isNaN(skip) ? undefined : skip,
@ -312,6 +309,43 @@ export class AdminController {
    return this.adminService.getMarketDataBySymbol({ dataSource, symbol });
  }

+  @Post('market-data/:dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
+  public async updateMarketData(
+    @Body() data: UpdateBulkMarketDataDto,
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const dataBulkUpdate: Prisma.MarketDataUpdateInput[] = data.marketData.map(
+      ({ date, marketPrice }) => ({
+        dataSource,
+        date,
+        marketPrice,
+        symbol,
+        state: 'CLOSE'
+      })
+    );
+
+    return this.marketDataService.updateMany({
+      data: dataBulkUpdate
+    });
+  }
+
+  /**
+   * @deprecated
+   */
  @Put('market-data/:dataSource/:symbol/:dateString')
  @UseGuards(AuthGuard('jwt'))
  public async update(
@ -332,7 +366,7 @@ export class AdminController {
      );
    }

-    const date = new Date(dateString);
+    const date = parseISO(dateString);

    return this.marketDataService.updateMarketData({
      data: { marketPrice: data.marketPrice, state: 'CLOSE' },
@ -364,8 +398,11 @@ export class AdminController {
        StatusCodes.FORBIDDEN
      );
    }
-
-    return this.adminService.addAssetProfile({ dataSource, symbol });
+    return this.adminService.addAssetProfile({
+      dataSource,
+      symbol,
+      currency: this.request.user.Settings.settings.baseCurrency
+    });
  }

  @Delete('profile-data/:dataSource/:symbol')
--- a/apps/api/src/app/admin/admin.module.ts
+++ b/apps/api/src/app/admin/admin.module.ts
@ -1,4 +1,5 @@
 import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
+import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
@ -15,6 +16,7 @@ import { QueueModule } from './queue/queue.module';

@Module({
  imports: [
+    ApiModule,
    ConfigurationModule,
    DataGatheringModule,
    DataProviderModule,
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -1,4 +1,5 @@
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
+import { environment } from '@ghostfolio/api/environments/environment';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
@ -7,17 +8,20 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
-  DEFAULT_PAGE_SIZE,
-  PROPERTY_CURRENCIES
+  DEFAULT_CURRENCY,
+  PROPERTY_CURRENCIES,
+  PROPERTY_IS_READ_ONLY_MODE,
+  PROPERTY_IS_USER_SIGNUP_ENABLED
 } from '@ghostfolio/common/config';
 import {
  AdminData,
  AdminMarketData,
  AdminMarketDataDetails,
+  AdminMarketDataItem,
  Filter,
  UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import { MarketDataQuery } from '@ghostfolio/common/types';
+import { MarketDataPreset } from '@ghostfolio/common/types';
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { AssetSubClass, Prisma, Property, SymbolProfile } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
@ -25,8 +29,6 @@ import { groupBy } from 'lodash';

@Injectable()
 export class AdminService {
-  private baseCurrency: string;
-
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly dataProviderService: DataProviderService,
@ -36,15 +38,22 @@ export class AdminService {
    private readonly propertyService: PropertyService,
    private readonly subscriptionService: SubscriptionService,
    private readonly symbolProfileService: SymbolProfileService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  public async addAssetProfile({
+    currency,
    dataSource,
    symbol
-  }: UniqueAsset): Promise<SymbolProfile | never> {
+  }: UniqueAsset & { currency?: string }): Promise<SymbolProfile | never> {
    try {
+      if (dataSource === 'MANUAL') {
+        return this.symbolProfileService.add({
+          currency,
+          dataSource,
+          symbol
+        });
+      }
+
      const assetProfiles = await this.dataProviderService.getAssetProfiles([
        { dataSource, symbol }
      ]);
@ -82,15 +91,15 @@ export class AdminService {
      exchangeRates: this.exchangeRateDataService
        .getCurrencies()
        .filter((currency) => {
-          return currency !== this.baseCurrency;
+          return currency !== DEFAULT_CURRENCY;
        })
        .map((currency) => {
          return {
-            label1: this.baseCurrency,
+            label1: DEFAULT_CURRENCY,
            label2: currency,
            value: this.exchangeRateDataService.toCurrency(
              1,
-              this.baseCurrency,
+              DEFAULT_CURRENCY,
              currency
            )
          };
@ -98,20 +107,21 @@ export class AdminService {
      settings: await this.propertyService.get(),
      transactionCount: await this.prismaService.order.count(),
      userCount: await this.prismaService.user.count(),
-      users: await this.getUsersWithAnalytics()
+      users: await this.getUsersWithAnalytics(),
+      version: environment.version
    };
  }

  public async getMarketData({
    filters,
-    queryId,
+    presetId,
    sortColumn,
    sortDirection,
    skip,
    take = Number.MAX_SAFE_INTEGER
  }: {
    filters?: Filter[];
-    queryId?: MarketDataQuery;
+    presetId?: MarketDataPreset;
    skip?: number;
    sortColumn?: string;
    sortDirection?: Prisma.SortOrder;
@ -121,17 +131,23 @@ export class AdminService {
      [{ symbol: 'asc' }];
    const where: Prisma.SymbolProfileWhereInput = {};

-    if (
-      queryId === 'ETF_WITHOUT_COUNTRIES' ||
-      queryId === 'ETF_WITHOUT_SECTORS'
+    if (presetId === 'CURRENCIES') {
+      return this.getMarketDataForCurrencies();
+    } else if (
+      presetId === 'ETF_WITHOUT_COUNTRIES' ||
+      presetId === 'ETF_WITHOUT_SECTORS'
    ) {
      filters = [{ id: 'ETF', type: 'ASSET_SUB_CLASS' }];
    }

+    const searchQuery = filters.find(({ type }) => {
+      return type === 'SEARCH_QUERY';
+    })?.id;
+
    const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
      filters,
-      (filter) => {
-        return filter.type;
+      ({ type }) => {
+        return type;
      }
    );

@ -144,6 +160,14 @@ export class AdminService {
      where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
    }

+    if (searchQuery) {
+      where.OR = [
+        { isin: { mode: 'insensitive', startsWith: searchQuery } },
+        { name: { mode: 'insensitive', startsWith: searchQuery } },
+        { symbol: { mode: 'insensitive', startsWith: searchQuery } }
+      ];
+    }
+
    if (sortColumn) {
      orderBy = [{ [sortColumn]: sortDirection }];

@ -170,7 +194,9 @@ export class AdminService {
          assetSubClass: true,
          comment: true,
          countries: true,
+          currency: true,
          dataSource: true,
+          name: true,
          Order: {
            orderBy: [{ date: 'asc' }],
            select: { date: true },
@ -191,7 +217,9 @@ export class AdminService {
        assetSubClass,
        comment,
        countries,
+        currency,
        dataSource,
+        name,
        Order,
        sectors,
        symbol
@ -210,8 +238,10 @@ export class AdminService {
          assetClass,
          assetSubClass,
          comment,
+          currency,
          countriesCount,
          dataSource,
+          name,
          symbol,
          marketDataItemCount,
          sectorsCount,
@ -221,12 +251,12 @@ export class AdminService {
      }
    );

-    if (queryId) {
-      if (queryId === 'ETF_WITHOUT_COUNTRIES') {
+    if (presetId) {
+      if (presetId === 'ETF_WITHOUT_COUNTRIES') {
        marketData = marketData.filter(({ countriesCount }) => {
          return countriesCount === 0;
        });
-      } else if (queryId === 'ETF_WITHOUT_SECTORS') {
+      } else if (presetId === 'ETF_WITHOUT_SECTORS') {
        marketData = marketData.filter(({ sectorsCount }) => {
          return sectorsCount === 0;
        });
@ -306,13 +336,47 @@ export class AdminService {
      response = await this.propertyService.delete({ key });
    }

-    if (key === PROPERTY_CURRENCIES) {
+    if (key === PROPERTY_IS_READ_ONLY_MODE && value === 'true') {
+      await this.putSetting(PROPERTY_IS_USER_SIGNUP_ENABLED, 'false');
+    } else if (key === PROPERTY_CURRENCIES) {
      await this.exchangeRateDataService.initialize();
    }

    return response;
  }

+  private async getMarketDataForCurrencies(): Promise<AdminMarketData> {
+    const marketDataItems = await this.prismaService.marketData.groupBy({
+      _count: true,
+      by: ['dataSource', 'symbol']
+    });
+
+    const marketData: AdminMarketDataItem[] = this.exchangeRateDataService
+      .getCurrencyPairs()
+      .map(({ dataSource, symbol }) => {
+        const marketDataItemCount =
+          marketDataItems.find((marketDataItem) => {
+            return (
+              marketDataItem.dataSource === dataSource &&
+              marketDataItem.symbol === symbol
+            );
+          })?._count ?? 0;
+
+        return {
+          dataSource,
+          marketDataItemCount,
+          symbol,
+          assetClass: 'CASH',
+          countriesCount: 0,
+          currency: symbol.replace(DEFAULT_CURRENCY, ''),
+          name: symbol,
+          sectorsCount: 0
+        };
+      });
+
+    return { marketData, count: marketData.length };
+  }
+
  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
    let orderBy: any = {
      createdAt: 'desc'
--- a/apps/api/src/app/admin/update-bulk-market-data.dto.ts
+++ b/apps/api/src/app/admin/update-bulk-market-data.dto.ts
@ -0,0 +1,11 @@
+import { Type } from 'class-transformer';
+import { ArrayNotEmpty, IsArray, isNotEmptyObject } from 'class-validator';
+
+import { UpdateMarketDataDto } from './update-market-data.dto';
+
+export class UpdateBulkMarketDataDto {
+  @ArrayNotEmpty()
+  @IsArray()
+  @Type(() => UpdateMarketDataDto)
+  marketData: UpdateMarketDataDto[];
+}
--- a/apps/api/src/app/admin/update-market-data.dto.ts
+++ b/apps/api/src/app/admin/update-market-data.dto.ts
@ -1,6 +1,10 @@
-import { IsNumber } from 'class-validator';
+import { IsDate, IsNumber, IsOptional } from 'class-validator';

 export class UpdateMarketDataDto {
+  @IsDate()
+  @IsOptional()
+  date?: Date;
+
  @IsNumber()
  marketPrice: number;
 }
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -7,11 +7,16 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
+import {
+  DEFAULT_LANGUAGE_CODE,
+  SUPPORTED_LANGUAGE_CODES
+} from '@ghostfolio/common/config';
 import { BullModule } from '@nestjs/bull';
-import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
+import { StatusCodes } from 'http-status-codes';

 import { AccessModule } from './access/access.module';
 import { AccountModule } from './account/account.module';
@ -23,7 +28,6 @@ import { BenchmarkModule } from './benchmark/benchmark.module';
 import { CacheModule } from './cache/cache.module';
 import { ExchangeRateModule } from './exchange-rate/exchange-rate.module';
 import { ExportModule } from './export/export.module';
-import { FrontendMiddleware } from './frontend.middleware';
 import { HealthModule } from './health/health.module';
 import { ImportModule } from './import/import.module';
 import { InfoModule } from './info/info.module';
@ -32,8 +36,10 @@ import { OrderModule } from './order/order.module';
 import { PlatformModule } from './platform/platform.module';
 import { PortfolioModule } from './portfolio/portfolio.module';
 import { RedisCacheModule } from './redis-cache/redis-cache.module';
+import { SitemapModule } from './sitemap/sitemap.module';
 import { SubscriptionModule } from './subscription/subscription.module';
 import { SymbolModule } from './symbol/symbol.module';
+import { TagModule } from './tag/tag.module';
 import { UserModule } from './user/user.module';

@Module({
@ -70,31 +76,37 @@ import { UserModule } from './user/user.module';
    RedisCacheModule,
    ScheduleModule.forRoot(),
    ServeStaticModule.forRoot({
-      serveStaticOptions: {
-        /*etag: false // Disable etag header to fix PWA
-        setHeaders: (res, path) => {
-          if (path.includes('ngsw.json')) {
-            // Disable cache (https://stackoverflow.com/questions/22632593/how-to-disable-webpage-caching-in-expressjs-nodejs/39775595)
-            // https://gertjans.home.xs4all.nl/javascript/cache-control.html#no-cache
-            res.set('Cache-Control', 'no-cache, no-store, must-revalidate');
-          }
-        }*/
-      },
+      exclude: ['/api*', '/sitemap.xml'],
      rootPath: join(__dirname, '..', 'client'),
-      exclude: ['/api*']
+      serveStaticOptions: {
+        setHeaders: (res) => {
+          if (res.req?.path === '/') {
+            let languageCode = DEFAULT_LANGUAGE_CODE;
+
+            try {
+              const code = res.req.headers['accept-language']
+                .split(',')[0]
+                .split('-')[0];
+
+              if (SUPPORTED_LANGUAGE_CODES.includes(code)) {
+                languageCode = code;
+              }
+            } catch {}
+
+            res.set('Location', `/${languageCode}`);
+            res.statusCode = StatusCodes.MOVED_PERMANENTLY;
+          }
+        }
+      }
    }),
+    SitemapModule,
    SubscriptionModule,
    SymbolModule,
+    TagModule,
    TwitterBotModule,
    UserModule
  ],
  controllers: [AppController],
  providers: [CronService]
 })
-export class AppModule {
-  configure(consumer: MiddlewareConsumer) {
-    consumer
-      .apply(FrontendMiddleware)
-      .forRoutes({ path: '*', method: RequestMethod.ALL });
-  }
-}
+export class AppModule {}
--- a/apps/api/src/app/auth/auth.controller.ts
+++ b/apps/api/src/app/auth/auth.controller.ts
@ -41,9 +41,8 @@ export class AuthController {
    @Param('accessToken') accessToken: string
  ): Promise<OAuthResponse> {
    try {
-      const authToken = await this.authService.validateAnonymousLogin(
-        accessToken
-      );
+      const authToken =
+        await this.authService.validateAnonymousLogin(accessToken);
      return { authToken };
    } catch {
      throw new HttpException(
--- a/apps/api/src/app/auth/auth.service.ts
+++ b/apps/api/src/app/auth/auth.service.ts
@ -55,7 +55,7 @@ export class AuthService {
        const isUserSignupEnabled =
          await this.propertyService.isUserSignupEnabled();

-        if (!isUserSignupEnabled) {
+        if (!isUserSignupEnabled || true) {
          throw new Error('Sign up forbidden');
        }

--- a/apps/api/src/app/auth/web-auth.service.ts
+++ b/apps/api/src/app/auth/web-auth.service.ts
@ -64,7 +64,7 @@ export class WebAuthService {
      }
    };

-    const options = generateRegistrationOptions(opts);
+    const options = await generateRegistrationOptions(opts);

    await this.userService.updateUser({
      data: {
@ -88,10 +88,16 @@ export class WebAuthService {
    let verification: VerifiedRegistrationResponse;
    try {
      const opts: VerifyRegistrationResponseOpts = {
-        credential,
        expectedChallenge,
        expectedOrigin: this.expectedOrigin,
-        expectedRPID: this.rpID
+        expectedRPID: this.rpID,
+        response: {
+          clientExtensionResults: credential.clientExtensionResults,
+          id: credential.id,
+          rawId: credential.rawId,
+          response: credential.response,
+          type: 'public-key'
+        }
      };
      verification = await verifyRegistrationResponse(opts);
    } catch (error) {
@ -117,8 +123,8 @@ export class WebAuthService {
         */
        existingDevice = await this.deviceService.createAuthDevice({
          counter,
-          credentialPublicKey,
-          credentialId: credentialID,
+          credentialId: Buffer.from(credentialID),
+          credentialPublicKey: Buffer.from(credentialPublicKey),
          User: { connect: { id: user.id } }
        });
      }
@ -152,7 +158,7 @@ export class WebAuthService {
      userVerification: 'preferred'
    };

-    const options = generateAuthenticationOptions(opts);
+    const options = await generateAuthenticationOptions(opts);

    await this.userService.updateUser({
      data: {
@ -181,7 +187,6 @@ export class WebAuthService {
    let verification: VerifiedAuthenticationResponse;
    try {
      const opts: VerifyAuthenticationResponseOpts = {
-        credential,
        authenticator: {
          credentialID: device.credentialId,
          credentialPublicKey: device.credentialPublicKey,
@ -189,9 +194,16 @@ export class WebAuthService {
        },
        expectedChallenge: `${user.authChallenge}`,
        expectedOrigin: this.expectedOrigin,
-        expectedRPID: this.rpID
+        expectedRPID: this.rpID,
+        response: {
+          clientExtensionResults: credential.clientExtensionResults,
+          id: credential.id,
+          rawId: credential.rawId,
+          response: credential.response,
+          type: 'public-key'
+        }
      };
-      verification = verifyAuthenticationResponse(opts);
+      verification = await verifyAuthenticationResponse(opts);
    } catch (error) {
      Logger.error(error, 'WebAuthService');
      throw new InternalServerErrorException({ error: error.message });
--- a/apps/api/src/app/benchmark/benchmark.controller.ts
+++ b/apps/api/src/app/benchmark/benchmark.controller.ts
@ -10,6 +10,7 @@ import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
  Body,
  Controller,
+  Delete,
  Get,
  HttpException,
  Inject,
@ -32,32 +33,6 @@ export class BenchmarkController {
    @Inject(REQUEST) private readonly request: RequestWithUser
  ) {}

-  @Get()
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  public async getBenchmark(): Promise<BenchmarkResponse> {
-    return {
-      benchmarks: await this.benchmarkService.getBenchmarks()
-    };
-  }
-
-  @Get(':dataSource/:symbol/:startDateString')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  public async getBenchmarkMarketDataBySymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('startDateString') startDateString: string,
-    @Param('symbol') symbol: string
-  ): Promise<BenchmarkMarketDataDetails> {
-    const startDate = new Date(startDateString);
-
-    return this.benchmarkService.getMarketDataBySymbol({
-      dataSource,
-      startDate,
-      symbol
-    });
-  }
-
  @Post()
  @UseGuards(AuthGuard('jwt'))
  public async addBenchmark(@Body() { dataSource, symbol }: UniqueAsset) {
@ -94,4 +69,70 @@ export class BenchmarkController {
      );
    }
  }
+
+  @Delete(':dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
+  public async deleteBenchmark(
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    try {
+      const benchmark = await this.benchmarkService.deleteBenchmark({
+        dataSource,
+        symbol
+      });
+
+      if (!benchmark) {
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.NOT_FOUND),
+          StatusCodes.NOT_FOUND
+        );
+      }
+
+      return benchmark;
+    } catch {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.INTERNAL_SERVER_ERROR),
+        StatusCodes.INTERNAL_SERVER_ERROR
+      );
+    }
+  }
+
+  @Get()
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  @UseInterceptors(TransformDataSourceInResponseInterceptor)
+  public async getBenchmark(): Promise<BenchmarkResponse> {
+    return {
+      benchmarks: await this.benchmarkService.getBenchmarks()
+    };
+  }
+
+  @Get(':dataSource/:symbol/:startDateString')
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  public async getBenchmarkMarketDataBySymbol(
+    @Param('dataSource') dataSource: DataSource,
+    @Param('startDateString') startDateString: string,
+    @Param('symbol') symbol: string
+  ): Promise<BenchmarkMarketDataDetails> {
+    const startDate = new Date(startDateString);
+
+    return this.benchmarkService.getMarketDataBySymbol({
+      dataSource,
+      startDate,
+      symbol
+    });
+  }
 }
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@ -64,7 +64,7 @@ export class BenchmarkService {

    const benchmarkAssetProfiles = await this.getBenchmarkAssetProfiles();

-    const promises: Promise<number>[] = [];
+    const promises: Promise<{ date: Date; marketPrice: number }>[] = [];

    const quotes = await this.dataProviderService.getQuotes({
      items: benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
@ -85,15 +85,14 @@ export class BenchmarkService {

      let performancePercentFromAllTimeHigh = 0;

-      if (allTimeHigh && marketPrice) {
+      if (allTimeHigh?.marketPrice && marketPrice) {
        performancePercentFromAllTimeHigh = this.calculateChangeInPercentage(
-          allTimeHigh,
+          allTimeHigh.marketPrice,
          marketPrice
        );
      } else {
        storeInCache = false;
      }
-
      return {
        marketCondition: this.getMarketCondition(
          performancePercentFromAllTimeHigh
@ -101,6 +100,7 @@ export class BenchmarkService {
        name: benchmarkAssetProfiles[index].name,
        performances: {
          allTimeHigh: {
+            date: allTimeHigh.date,
            performancePercent: performancePercentFromAllTimeHigh
          }
        }
@ -245,6 +245,43 @@ export class BenchmarkService {
    };
  }

+  public async deleteBenchmark({
+    dataSource,
+    symbol
+  }: UniqueAsset): Promise<Partial<SymbolProfile>> {
+    const assetProfile = await this.prismaService.symbolProfile.findFirst({
+      where: {
+        dataSource,
+        symbol
+      }
+    });
+
+    if (!assetProfile) {
+      return null;
+    }
+
+    let benchmarks =
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as BenchmarkProperty[]) ?? [];
+
+    benchmarks = benchmarks.filter(({ symbolProfileId }) => {
+      return symbolProfileId !== assetProfile.id;
+    });
+
+    await this.propertyService.put({
+      key: PROPERTY_BENCHMARKS,
+      value: JSON.stringify(benchmarks)
+    });
+
+    return {
+      dataSource,
+      symbol,
+      id: assetProfile.id,
+      name: assetProfile.name
+    };
+  }
+
  private getMarketCondition(aPerformanceInPercent: number) {
    return aPerformanceInPercent <= -0.2 ? 'BEAR_MARKET' : 'NEUTRAL_MARKET';
  }
--- a/apps/api/src/app/exchange-rate/exchange-rate.controller.ts
+++ b/apps/api/src/app/exchange-rate/exchange-rate.controller.ts
@ -7,6 +7,7 @@ import {
  UseGuards
 } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
+import { parseISO } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { ExchangeRateService } from './exchange-rate.service';
@ -23,7 +24,7 @@ export class ExchangeRateController {
    @Param('dateString') dateString: string,
    @Param('symbol') symbol: string
  ): Promise<IDataProviderHistoricalResponse> {
-    const date = new Date(dateString);
+    const date = parseISO(dateString);

    const exchangeRate = await this.exchangeRateService.getExchangeRate({
      date,
--- a/apps/api/src/app/export/export.module.ts
+++ b/apps/api/src/app/export/export.module.ts
@ -1,8 +1,9 @@
+import { AccountModule } from '@ghostfolio/api/app/account/account.module';
+import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { Module } from '@nestjs/common';

 import { ExportController } from './export.controller';
@ -10,10 +11,11 @@ import { ExportService } from './export.service';

@Module({
  imports: [
+    AccountModule,
    ConfigurationModule,
    DataGatheringModule,
    DataProviderModule,
-    PrismaModule,
+    OrderModule,
    RedisCacheModule
  ],
  controllers: [ExportController],
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -1,11 +1,15 @@
+import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
-import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { Export } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';

@Injectable()
 export class ExportService {
-  public constructor(private readonly prismaService: PrismaService) {}
+  public constructor(
+    private readonly accountService: AccountService,
+    private readonly orderService: OrderService
+  ) {}

  public async export({
    activityIds,
@ -14,36 +18,30 @@ export class ExportService {
    activityIds?: string[];
    userId: string;
  }): Promise<Export> {
-    const accounts = await this.prismaService.account.findMany({
-      orderBy: {
-        name: 'asc'
-      },
-      select: {
-        accountType: true,
-        balance: true,
-        comment: true,
-        currency: true,
-        id: true,
-        isExcluded: true,
-        name: true,
-        platformId: true
-      },
-      where: { userId }
-    });
+    const accounts = (
+      await this.accountService.accounts({
+        orderBy: {
+          name: 'asc'
+        },
+        where: { userId }
+      })
+    ).map(
+      ({ balance, comment, currency, id, isExcluded, name, platformId }) => {
+        return {
+          balance,
+          comment,
+          currency,
+          id,
+          isExcluded,
+          name,
+          platformId
+        };
+      }
+    );

-    let activities = await this.prismaService.order.findMany({
+    let activities = await this.orderService.orders({
+      include: { SymbolProfile: true },
      orderBy: { date: 'desc' },
-      select: {
-        accountId: true,
-        comment: true,
-        date: true,
-        fee: true,
-        id: true,
-        quantity: true,
-        SymbolProfile: true,
-        type: true,
-        unitPrice: true
-      },
      where: { userId }
    });

@ -79,7 +77,13 @@ export class ExportService {
            currency: SymbolProfile.currency,
            dataSource: SymbolProfile.dataSource,
            date: date.toISOString(),
-            symbol: type === 'ITEM' ? SymbolProfile.name : SymbolProfile.symbol
+            symbol:
+              type === 'FEE' ||
+              type === 'INTEREST' ||
+              type === 'ITEM' ||
+              type === 'LIABILITY'
+                ? SymbolProfile.name
+                : SymbolProfile.symbol
          };
        }
      )
--- a/apps/api/src/app/frontend.middleware.ts
+++ b/apps/api/src/app/frontend.middleware.ts
@ -1,237 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-
-import { environment } from '@ghostfolio/api/environments/environment';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import { Injectable, NestMiddleware } from '@nestjs/common';
-import { format } from 'date-fns';
-import { NextFunction, Request, Response } from 'express';
-
-@Injectable()
-export class FrontendMiddleware implements NestMiddleware {
-  public indexHtmlDe = '';
-  public indexHtmlEn = '';
-  public indexHtmlEs = '';
-  public indexHtmlFr = '';
-  public indexHtmlIt = '';
-  public indexHtmlNl = '';
-  public indexHtmlPt = '';
-
-  private static readonly DEFAULT_DESCRIPTION =
-    'Ghostfolio is a personal finance dashboard to keep track of your assets like stocks, ETFs or cryptocurrencies across multiple platforms.';
-
-  public constructor(
-    private readonly configurationService: ConfigurationService
-  ) {
-    try {
-      this.indexHtmlDe = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('de'),
-        'utf8'
-      );
-      this.indexHtmlEn = fs.readFileSync(
-        this.getPathOfIndexHtmlFile(DEFAULT_LANGUAGE_CODE),
-        'utf8'
-      );
-      this.indexHtmlEs = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('es'),
-        'utf8'
-      );
-      this.indexHtmlFr = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('fr'),
-        'utf8'
-      );
-      this.indexHtmlIt = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('it'),
-        'utf8'
-      );
-      this.indexHtmlNl = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('nl'),
-        'utf8'
-      );
-      this.indexHtmlPt = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('pt'),
-        'utf8'
-      );
-    } catch {}
-  }
-
-  public use(request: Request, response: Response, next: NextFunction) {
-    const currentDate = format(new Date(), DATE_FORMAT);
-    let featureGraphicPath = 'assets/cover.png';
-    let title = 'Ghostfolio – Open Source Wealth Management Software';
-
-    if (request.path.startsWith('/en/blog/2022/08/500-stars-on-github')) {
-      featureGraphicPath = 'assets/images/blog/500-stars-on-github.jpg';
-      title = `500 Stars - ${title}`;
-    } else if (request.path.startsWith('/en/blog/2022/10/hacktoberfest-2022')) {
-      featureGraphicPath = 'assets/images/blog/hacktoberfest-2022.png';
-      title = `Hacktoberfest 2022 - ${title}`;
-    } else if (request.path.startsWith('/en/blog/2022/11/black-friday-2022')) {
-      featureGraphicPath = 'assets/images/blog/black-friday-2022.jpg';
-      title = `Black Friday 2022 - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/en/blog/2022/12/the-importance-of-tracking-your-personal-finances'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/20221226.jpg';
-      title = `The importance of tracking your personal finances - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/ghostfolio-x-sackgeld.png';
-      title = `Ghostfolio auf Sackgeld.com vorgestellt - ${title}`;
-    } else if (
-      request.path.startsWith('/en/blog/2023/02/ghostfolio-meets-umbrel')
-    ) {
-      featureGraphicPath = 'assets/images/blog/ghostfolio-x-umbrel.png';
-      title = `Ghostfolio meets Umbrel - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/en/blog/2023/03/ghostfolio-reaches-1000-stars-on-github'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/1000-stars-on-github.jpg';
-      title = `Ghostfolio reaches 1’000 Stars on GitHub - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/en/blog/2023/05/unlock-your-financial-potential-with-ghostfolio'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/20230520.jpg';
-      title = `Unlock your Financial Potential with Ghostfolio - ${title}`;
-    } else if (
-      request.path.startsWith('/en/blog/2023/07/exploring-the-path-to-fire')
-    ) {
-      featureGraphicPath = 'assets/images/blog/20230701.jpg';
-      title = `Exploring the Path to FIRE - ${title}`;
-    }
-
-    if (
-      request.path.startsWith('/api/') ||
-      this.isFileRequest(request.url) ||
-      !environment.production
-    ) {
-      // Skip
-      next();
-    } else if (request.path === '/de' || request.path.startsWith('/de/')) {
-      response.send(
-        this.interpolate(this.indexHtmlDe, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Mit dem Finanz-Dashboard Ghostfolio können Sie Ihr Vermögen in Form von Aktien, ETFs oder Kryptowährungen verteilt über mehrere Finanzinstitute überwachen.',
-          languageCode: 'de',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/es' || request.path.startsWith('/es/')) {
-      response.send(
-        this.interpolate(this.indexHtmlEs, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Ghostfolio es un dashboard de finanzas personales para hacer un seguimiento de tus activos como acciones, ETFs o criptodivisas a través de múltiples plataformas.',
-          languageCode: 'es',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/fr' || request.path.startsWith('/fr/')) {
-      response.send(
-        this.interpolate(this.indexHtmlFr, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Ghostfolio est un dashboard de finances personnelles qui permet de suivre vos actifs comme les actions, les ETF ou les crypto-monnaies sur plusieurs plateformes.',
-          languageCode: 'fr',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/it' || request.path.startsWith('/it/')) {
-      response.send(
-        this.interpolate(this.indexHtmlIt, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Ghostfolio è un dashboard di finanza personale per tenere traccia delle vostre attività come azioni, ETF o criptovalute su più piattaforme.',
-          languageCode: 'it',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/nl' || request.path.startsWith('/nl/')) {
-      response.send(
-        this.interpolate(this.indexHtmlNl, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Ghostfolio is een persoonlijk financieel dashboard om uw activa zoals aandelen, ETF’s of cryptocurrencies over meerdere platforms bij te houden.',
-          languageCode: 'nl',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/pt' || request.path.startsWith('/pt/')) {
-      response.send(
-        this.interpolate(this.indexHtmlPt, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description:
-            'Ghostfolio é um dashboard de finanças pessoais para acompanhar os seus activos como acções, ETFs ou criptomoedas em múltiplas plataformas.',
-          languageCode: 'pt',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else {
-      response.send(
-        this.interpolate(this.indexHtmlEn, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          description: FrontendMiddleware.DEFAULT_DESCRIPTION,
-          languageCode: DEFAULT_LANGUAGE_CODE,
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    }
-  }
-
-  private getPathOfIndexHtmlFile(aLocale: string) {
-    return path.join(__dirname, '..', 'client', aLocale, 'index.html');
-  }
-
-  private interpolate(template: string, context: any) {
-    return template.replace(/[$]{([^}]+)}/g, (_, objectPath) => {
-      const properties = objectPath.split('.');
-      return properties.reduce(
-        (previous, current) => previous?.[current],
-        context
-      );
-    });
-  }
-
-  private isFileRequest(filename: string) {
-    if (filename === '/assets/LICENSE') {
-      return true;
-    } else if (filename.includes('auth/ey')) {
-      return false;
-    }
-
-    return filename.split('.').pop() !== filename;
-  }
-}
--- a/apps/api/src/app/health/health.controller.ts
+++ b/apps/api/src/app/health/health.controller.ts
@ -18,6 +18,19 @@ export class HealthController {
  @Get()
  public async getHealth() {}

+  @Get('data-enhancer/:name')
+  public async getHealthOfDataEnhancer(@Param('name') name: string) {
+    const hasResponse =
+      await this.healthService.hasResponseFromDataEnhancer(name);
+
+    if (hasResponse !== true) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.SERVICE_UNAVAILABLE),
+        StatusCodes.SERVICE_UNAVAILABLE
+      );
+    }
+  }
+
  @Get('data-provider/:dataSource')
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async getHealthOfDataProvider(
@ -30,9 +43,8 @@ export class HealthController {
      );
    }

-    const hasResponse = await this.healthService.hasResponseFromDataProvider(
-      dataSource
-    );
+    const hasResponse =
+      await this.healthService.hasResponseFromDataProvider(dataSource);

    if (hasResponse !== true) {
      throw new HttpException(
--- a/apps/api/src/app/health/health.module.ts
+++ b/apps/api/src/app/health/health.module.ts
@ -1,4 +1,5 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { DataEnhancerModule } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { Module } from '@nestjs/common';

@ -7,7 +8,7 @@ import { HealthService } from './health.service';

@Module({
  controllers: [HealthController],
-  imports: [ConfigurationModule, DataProviderModule],
+  imports: [ConfigurationModule, DataEnhancerModule, DataProviderModule],
  providers: [HealthService]
 })
 export class HealthModule {}
--- a/apps/api/src/app/health/health.service.ts
+++ b/apps/api/src/app/health/health.service.ts
@ -1,3 +1,4 @@
+import { DataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
@ -5,9 +6,14 @@ import { DataSource } from '@prisma/client';
@Injectable()
 export class HealthService {
  public constructor(
+    private readonly dataEnhancerService: DataEnhancerService,
    private readonly dataProviderService: DataProviderService
  ) {}

+  public async hasResponseFromDataEnhancer(aName: string) {
+    return this.dataEnhancerService.enhance(aName);
+  }
+
  public async hasResponseFromDataProvider(aDataSource: DataSource) {
    return this.dataProviderService.checkQuote(aDataSource);
  }
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@ -8,10 +8,15 @@ import {
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
-import { parseDate } from '@ghostfolio/common/helper';
+import {
+  DATE_FORMAT,
+  getAssetProfileIdentifier,
+  parseDate
+} from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import {
  AccountWithPlatform,
@ -20,13 +25,15 @@ import {
 import { Injectable } from '@nestjs/common';
 import { DataSource, Prisma, SymbolProfile } from '@prisma/client';
 import Big from 'big.js';
-import { endOfToday, isAfter, isSameDay, parseISO } from 'date-fns';
+import { endOfToday, format, isAfter, isSameDay, parseISO } from 'date-fns';
+import { uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';

@Injectable()
 export class ImportService {
  public constructor(
    private readonly accountService: AccountService,
+    private readonly dataGatheringService: DataGatheringService,
    private readonly dataProviderService: DataProviderService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly orderService: OrderService,
@ -220,8 +227,7 @@ export class ImportService {

    const assetProfiles = await this.validateActivities({
      activitiesDto,
-      maxActivitiesToImport,
-      userId
+      maxActivitiesToImport
    });

    const activitiesExtendedWithErrors = await this.extendActivitiesWithErrors({
@ -243,17 +249,47 @@ export class ImportService {

    const activities: Activity[] = [];

-    for (const {
-      accountId,
-      comment,
-      date,
-      error,
-      fee,
-      quantity,
-      SymbolProfile: assetProfile,
-      type,
-      unitPrice
-    } of activitiesExtendedWithErrors) {
+    for (let [
+      index,
+      {
+        accountId,
+        comment,
+        date,
+        error,
+        fee,
+        quantity,
+        SymbolProfile,
+        type,
+        unitPrice
+      }
+    ] of activitiesExtendedWithErrors.entries()) {
+      const assetProfile = assetProfiles[
+        getAssetProfileIdentifier({
+          dataSource: SymbolProfile.dataSource,
+          symbol: SymbolProfile.symbol
+        })
+      ] ?? {
+        currency: SymbolProfile.currency,
+        dataSource: SymbolProfile.dataSource,
+        symbol: SymbolProfile.symbol
+      };
+      const {
+        assetClass,
+        assetSubClass,
+        countries,
+        createdAt,
+        currency,
+        dataSource,
+        id,
+        isin,
+        name,
+        scraperConfiguration,
+        sectors,
+        symbol,
+        symbolMapping,
+        url,
+        updatedAt
+      } = assetProfile;
      const validatedAccount = accounts.find(({ id }) => {
        return id === accountId;
      });
@ -264,6 +300,35 @@ export class ImportService {
            Account?: { id: string; name: string };
          });

+      if (SymbolProfile.currency !== assetProfile.currency) {
+        // Convert the unit price and fee to the asset currency if the imported
+        // activity is in a different currency
+        unitPrice = await this.exchangeRateDataService.toCurrencyAtDate(
+          unitPrice,
+          SymbolProfile.currency,
+          assetProfile.currency,
+          date
+        );
+
+        if (!unitPrice) {
+          throw new Error(
+            `activities.${index} historical exchange rate at ${format(
+              date,
+              DATE_FORMAT
+            )} is not available from "${SymbolProfile.currency}" to "${
+              assetProfile.currency
+            }"`
+          );
+        }
+
+        fee = await this.exchangeRateDataService.toCurrencyAtDate(
+          fee,
+          SymbolProfile.currency,
+          assetProfile.currency,
+          date
+        );
+      }
+
      if (isDryRun) {
        order = {
          comment,
@ -279,23 +344,22 @@ export class ImportService {
          id: uuidv4(),
          isDraft: isAfter(date, endOfToday()),
          SymbolProfile: {
-            assetClass: assetProfile.assetClass,
-            assetSubClass: assetProfile.assetSubClass,
-            comment: assetProfile.comment,
-            countries: assetProfile.countries,
-            createdAt: assetProfile.createdAt,
-            currency: assetProfile.currency,
-            dataSource: assetProfile.dataSource,
-            id: assetProfile.id,
-            isin: assetProfile.isin,
-            name: assetProfile.name,
-            scraperConfiguration: assetProfile.scraperConfiguration,
-            sectors: assetProfile.sectors,
-            symbol: assetProfile.currency,
-            symbolMapping: assetProfile.symbolMapping,
-            updatedAt: assetProfile.updatedAt,
-            url: assetProfile.url,
-            ...assetProfiles[assetProfile.symbol]
+            assetClass,
+            assetSubClass,
+            countries,
+            createdAt,
+            currency,
+            dataSource,
+            id,
+            isin,
+            name,
+            scraperConfiguration,
+            sectors,
+            symbol,
+            symbolMapping,
+            updatedAt,
+            url,
+            comment: assetProfile.comment
          },
          Account: validatedAccount,
          symbolProfileId: undefined,
@ -318,14 +382,14 @@ export class ImportService {
          SymbolProfile: {
            connectOrCreate: {
              create: {
-                currency: assetProfile.currency,
-                dataSource: assetProfile.dataSource,
-                symbol: assetProfile.symbol
+                currency,
+                dataSource,
+                symbol
              },
              where: {
                dataSource_symbol: {
-                  dataSource: assetProfile.dataSource,
-                  symbol: assetProfile.symbol
+                  dataSource,
+                  symbol
                }
              }
            }
@ -337,24 +401,49 @@ export class ImportService {

      const value = new Big(quantity).mul(unitPrice).toNumber();

-      //@ts-ignore
      activities.push({
        ...order,
        error,
        value,
        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
          fee,
-          assetProfile.currency,
+          currency,
          userCurrency
        ),
+        // @ts-ignore
+        SymbolProfile: assetProfile,
        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
          value,
-          assetProfile.currency,
+          currency,
          userCurrency
        )
      });
    }

+    activities.sort((activity1, activity2) => {
+      return Number(activity1.date) - Number(activity2.date);
+    });
+
+    if (!isDryRun) {
+      // Gather symbol data in the background, if not dry run
+      const uniqueActivities = uniqBy(activities, ({ SymbolProfile }) => {
+        return getAssetProfileIdentifier({
+          dataSource: SymbolProfile.dataSource,
+          symbol: SymbolProfile.symbol
+        });
+      });
+
+      this.dataGatheringService.gatherSymbols(
+        uniqueActivities.map(({ date, SymbolProfile }) => {
+          return {
+            date,
+            dataSource: SymbolProfile.dataSource,
+            symbol: SymbolProfile.symbol
+          };
+        })
+      );
+    }
+
    return activities;
  }

@ -446,25 +535,30 @@ export class ImportService {

  private async validateActivities({
    activitiesDto,
-    maxActivitiesToImport,
-    userId
+    maxActivitiesToImport
  }: {
    activitiesDto: Partial<CreateOrderDto>[];
    maxActivitiesToImport: number;
-    userId: string;
  }) {
    if (activitiesDto?.length > maxActivitiesToImport) {
      throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
    }

    const assetProfiles: {
-      [symbol: string]: Partial<SymbolProfile>;
+      [assetProfileIdentifier: string]: Partial<SymbolProfile>;
    } = {};

+    const uniqueActivitiesDto = uniqBy(
+      activitiesDto,
+      ({ dataSource, symbol }) => {
+        return getAssetProfileIdentifier({ dataSource, symbol });
+      }
+    );
+
    for (const [
      index,
      { currency, dataSource, symbol }
-    ] of activitiesDto.entries()) {
+    ] of uniqueActivitiesDto.entries()) {
      if (dataSource !== 'MANUAL') {
        const assetProfile = (
          await this.dataProviderService.getAssetProfiles([
@ -472,19 +566,26 @@ export class ImportService {
          ])
        )?.[symbol];

-        if (assetProfile === undefined) {
+        if (!assetProfile?.name) {
          throw new Error(
            `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
          );
        }

-        if (assetProfile.currency !== currency) {
+        if (
+          assetProfile.currency !== currency &&
+          !this.exchangeRateDataService.hasCurrencyPair(
+            currency,
+            assetProfile.currency
+          )
+        ) {
          throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}"`
+            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}" and no exchange rate is available from "${currency}" to "${assetProfile.currency}"`
          );
        }

-        assetProfiles[symbol] = assetProfile;
+        assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
+          assetProfile;
      }
    }

--- a/apps/api/src/app/info/info.module.ts
+++ b/apps/api/src/app/info/info.module.ts
@ -1,6 +1,7 @@
 import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
 import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
@ -28,11 +29,11 @@ import { InfoService } from './info.service';
      signOptions: { expiresIn: '30 days' }
    }),
    PlatformModule,
-    PrismaModule,
    PropertyModule,
    RedisCacheModule,
    SymbolProfileModule,
-    TagModule
+    TagModule,
+    UserModule
  ],
  providers: [InfoService]
 })
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -1,12 +1,14 @@
 import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
 import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
+  DEFAULT_CURRENCY,
+  DEFAULT_REQUEST_TIMEOUT,
  PROPERTY_BETTER_UPTIME_MONITOR_ID,
  PROPERTY_COUNTRIES_OF_SUBSCRIBERS,
  PROPERTY_DEMO_USER_ID,
@ -30,9 +32,9 @@ import { permissions } from '@ghostfolio/common/permissions';
 import { SubscriptionOffer } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import * as bent from 'bent';
 import * as cheerio from 'cheerio';
 import { format, subDays } from 'date-fns';
+import got from 'got';

@Injectable()
 export class InfoService {
@ -44,21 +46,17 @@ export class InfoService {
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly jwtService: JwtService,
    private readonly platformService: PlatformService,
-    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
    private readonly redisCacheService: RedisCacheService,
-    private readonly tagService: TagService
+    private readonly tagService: TagService,
+    private readonly userService: UserService
  ) {}

  public async get(): Promise<InfoItem> {
    const info: Partial<InfoItem> = {};
    let isReadOnlyMode: boolean;
-    const platforms = (
-      await this.platformService.getPlatforms({
-        orderBy: { name: 'asc' }
-      })
-    ).map(({ id, name }) => {
-      return { id, name };
+    const platforms = await this.platformService.getPlatforms({
+      orderBy: { name: 'asc' }
    });
    let systemMessage: string;

@ -139,18 +137,13 @@ export class InfoService {
      subscriptions,
      systemMessage,
      tags,
-      baseCurrency: this.configurationService.get('BASE_CURRENCY'),
+      baseCurrency: DEFAULT_CURRENCY,
      currencies: this.exchangeRateDataService.getCurrencies()
    };
  }

  private async countActiveUsers(aDays: number) {
-    return await this.prismaService.user.count({
-      orderBy: {
-        Analytics: {
-          updatedAt: 'desc'
-        }
-      },
+    return this.userService.count({
      where: {
        AND: [
          {
@ -172,20 +165,24 @@ export class InfoService {

  private async countDockerHubPulls(): Promise<number> {
    try {
-      const get = bent(
-        `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { pull_count } = await got(
+        `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
+        {
+          headers: { 'User-Agent': 'request' },
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

-      const { pull_count } = await get();
      return pull_count;
    } catch (error) {
-      Logger.error(error, 'InfoService');
+      Logger.error(error, 'InfoService - DockerHub');

      return undefined;
    }
@ -193,16 +190,18 @@ export class InfoService {

  private async countGitHubContributors(): Promise<number> {
    try {
-      const get = bent(
-        'https://github.com/ghostfolio/ghostfolio',
-        'GET',
-        'string',
-        200,
-        {}
-      );
+      const abortController = new AbortController();

-      const html = await get();
-      const $ = cheerio.load(html);
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { body } = await got('https://github.com/ghostfolio/ghostfolio', {
+        // @ts-ignore
+        signal: abortController.signal
+      });
+
+      const $ = cheerio.load(body);

      return extractNumberFromString(
        $(
@ -210,7 +209,7 @@ export class InfoService {
        ).text()
      );
    } catch (error) {
-      Logger.error(error, 'InfoService');
+      Logger.error(error, 'InfoService - GitHub');

      return undefined;
    }
@ -218,30 +217,31 @@ export class InfoService {

  private async countGitHubStargazers(): Promise<number> {
    try {
-      const get = bent(
-        `https://api.github.com/repos/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { stargazers_count } = await got(
+        `https://api.github.com/repos/ghostfolio/ghostfolio`,
+        {
+          headers: { 'User-Agent': 'request' },
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

-      const { stargazers_count } = await get();
      return stargazers_count;
    } catch (error) {
-      Logger.error(error, 'InfoService');
+      Logger.error(error, 'InfoService - GitHub');

      return undefined;
    }
  }

  private async countNewUsers(aDays: number) {
-    return await this.prismaService.user.count({
-      orderBy: {
-        createdAt: 'desc'
-      },
+    return this.userService.count({
      where: {
        AND: [
          {
@ -332,11 +332,10 @@ export class InfoService {
      return undefined;
    }

-    const stripeConfig = (await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_STRIPE_CONFIG }
-    })) ?? { value: '{}' };
-
-    return JSON.parse(stripeConfig.value);
+    return (
+      ((await this.propertyService.getByKey(PROPERTY_STRIPE_CONFIG)) as any) ??
+      {}
+    );
  }

  private async getUptime(): Promise<number> {
@ -346,25 +345,31 @@ export class InfoService {
          PROPERTY_BETTER_UPTIME_MONITOR_ID
        )) as string;

-        const get = bent(
-          `https://betteruptime.com/api/v2/monitors/${monitorId}/sla?from=${format(
+        const abortController = new AbortController();
+
+        setTimeout(() => {
+          abortController.abort();
+        }, DEFAULT_REQUEST_TIMEOUT);
+
+        const { data } = await got(
+          `https://uptime.betterstack.com/api/v2/monitors/${monitorId}/sla?from=${format(
            subDays(new Date(), 90),
            DATE_FORMAT
          )}&to${format(new Date(), DATE_FORMAT)}`,
-          'GET',
-          'json',
-          200,
          {
-            Authorization: `Bearer ${this.configurationService.get(
-              'BETTER_UPTIME_API_KEY'
-            )}`
+            headers: {
+              Authorization: `Bearer ${this.configurationService.get(
+                'BETTER_UPTIME_API_KEY'
+              )}`
+            },
+            // @ts-ignore
+            signal: abortController.signal
          }
-        );
+        ).json<any>();

-        const { data } = await get();
        return data.attributes.availability / 100;
      } catch (error) {
-        Logger.error(error, 'InfoService');
+        Logger.error(error, 'InfoService - Better Stack');

        return undefined;
      }
--- a/apps/api/src/app/logo/logo.service.ts
+++ b/apps/api/src/app/logo/logo.service.ts
@ -1,8 +1,9 @@
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import { DEFAULT_REQUEST_TIMEOUT } from '@ghostfolio/common/config';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import { HttpException, Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
-import * as bent from 'bent';
+import got from 'got';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

@Injectable()
@ -41,15 +42,19 @@ export class LogoService {
  }

  private getBuffer(aUrl: string) {
-    const get = bent(
+    const abortController = new AbortController();
+
+    setTimeout(() => {
+      abortController.abort();
+    }, DEFAULT_REQUEST_TIMEOUT);
+
+    return got(
      `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
-      'GET',
-      'buffer',
-      200,
      {
-        'User-Agent': 'request'
+        headers: { 'User-Agent': 'request' },
+        // @ts-ignore
+        signal: abortController.signal
      }
-    );
-    return get();
+    ).buffer();
  }
 }
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -2,6 +2,7 @@ import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
 import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@ -36,6 +37,7 @@ import { UpdateOrderDto } from './update-order.dto';
 export class OrderController {
  public constructor(
    private readonly apiService: ApiService,
+    private readonly dataGatheringService: DataGatheringService,
    private readonly impersonationService: ImpersonationService,
    private readonly orderService: OrderService,
    @Inject(REQUEST) private readonly request: RequestWithUser
@ -87,7 +89,9 @@ export class OrderController {
    @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId,
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('tags') filterByTags?: string
+    @Query('skip') skip?: number,
+    @Query('tags') filterByTags?: string,
+    @Query('take') take?: number
  ): Promise<Activities> {
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
@ -103,6 +107,8 @@ export class OrderController {
      filters,
      userCurrency,
      includeDrafts: true,
+      skip: isNaN(skip) ? undefined : skip,
+      take: isNaN(take) ? undefined : take,
      userId: impersonationUserId || this.request.user.id,
      withExcludedAccounts: true
    });
@ -123,7 +129,7 @@ export class OrderController {
      );
    }

-    return this.orderService.createOrder({
+    const order = await this.orderService.createOrder({
      ...data,
      date: parseISO(data.date),
      SymbolProfile: {
@ -144,6 +150,20 @@ export class OrderController {
      User: { connect: { id: this.request.user.id } },
      userId: this.request.user.id
    });
+
+    if (data.dataSource && !order.isDraft) {
+      // Gather symbol data in the background, if data source is set
+      // (not MANUAL) and not draft
+      this.dataGatheringService.gatherSymbols([
+        {
+          dataSource: data.dataSource,
+          date: order.date,
+          symbol: data.symbol
+        }
+      ]);
+    }
+
+    return order;
  }

  @Put(':id')
--- a/apps/api/src/app/order/order.module.ts
+++ b/apps/api/src/app/order/order.module.ts
@ -2,6 +2,7 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@ -31,6 +32,6 @@ import { OrderService } from './order.service';
    SymbolProfileModule,
    UserModule
  ],
-  providers: [AccountService, OrderService]
+  providers: [AccountBalanceService, AccountService, OrderService]
 })
 export class OrderModule {}
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -7,6 +7,7 @@ import {
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Filter } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
@ -96,7 +97,12 @@ export class OrderService {
    const updateAccountBalance = data.updateAccountBalance ?? false;
    const userId = data.userId;

-    if (data.type === 'ITEM' || data.type === 'LIABILITY') {
+    if (
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+    ) {
      const assetClass = data.assetClass;
      const assetSubClass = data.assetSubClass;
      currency = data.SymbolProfile.connectOrCreate.create.currency;
@ -117,32 +123,21 @@ export class OrderService {
      };
    }

-    await this.dataGatheringService.addJobToQueue({
-      data: {
-        dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-        symbol: data.SymbolProfile.connectOrCreate.create.symbol
-      },
-      name: GATHER_ASSET_PROFILE_PROCESS,
-      opts: {
-        ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: `${data.SymbolProfile.connectOrCreate.create.dataSource}-${data.SymbolProfile.connectOrCreate.create.symbol}`
-      }
-    });
-
-    const isDraft =
-      data.type === 'LIABILITY'
-        ? false
-        : isAfter(data.date as Date, endOfToday());
-
-    if (!isDraft) {
-      // Gather symbol data of order in the background, if not draft
-      this.dataGatheringService.gatherSymbols([
-        {
+    if (data.SymbolProfile.connectOrCreate.create.dataSource !== 'MANUAL') {
+      this.dataGatheringService.addJobToQueue({
+        data: {
          dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-          date: <Date>data.date,
          symbol: data.SymbolProfile.connectOrCreate.create.symbol
+        },
+        name: GATHER_ASSET_PROFILE_PROCESS,
+        opts: {
+          ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
+          jobId: getAssetProfileIdentifier({
+            dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
+            symbol: data.SymbolProfile.connectOrCreate.create.symbol
+          })
        }
-      ]);
+      });
    }

    delete data.accountId;
@ -162,6 +157,14 @@ export class OrderService {

    const orderData: Prisma.OrderCreateInput = data;

+    const isDraft =
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+        ? false
+        : isAfter(data.date as Date, endOfToday());
+
    const order = await this.prismaService.order.create({
      data: {
        ...orderData,
@ -204,7 +207,12 @@ export class OrderService {
      where
    });

-    if (order.type === 'ITEM' || order.type === 'LIABILITY') {
+    if (
+      order.type === 'FEE' ||
+      order.type === 'INTEREST' ||
+      order.type === 'ITEM' ||
+      order.type === 'LIABILITY'
+    ) {
      await this.symbolProfileService.deleteById(order.symbolProfileId);
    }

@ -222,6 +230,8 @@ export class OrderService {
  public async getOrders({
    filters,
    includeDrafts = false,
+    skip,
+    take = Number.MAX_SAFE_INTEGER,
    types,
    userCurrency,
    userId,
@ -229,6 +239,8 @@ export class OrderService {
  }: {
    filters?: Filter[];
    includeDrafts?: boolean;
+    skip?: number;
+    take?: number;
    types?: TypeOfOrder[];
    userCurrency: string;
    userId: string;
@ -307,6 +319,8 @@ export class OrderService {

    return (
      await this.orders({
+        skip,
+        take,
        where,
        include: {
          // eslint-disable-next-line @typescript-eslint/naming-convention
@ -375,7 +389,12 @@ export class OrderService {

    let isDraft = false;

-    if (data.type === 'ITEM' || data.type === 'LIABILITY') {
+    if (
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+    ) {
      delete data.SymbolProfile.connect;
    } else {
      delete data.SymbolProfile.update;
--- a/apps/api/src/app/platform/platform.controller.ts
+++ b/apps/api/src/app/platform/platform.controller.ts
@ -47,6 +47,7 @@ export class PlatformController {
        StatusCodes.FORBIDDEN
      );
    }
+
    return this.platformService.createPlatform(data);
  }

--- a/apps/api/src/app/platform/platform.service.ts
+++ b/apps/api/src/app/platform/platform.service.ts
@ -6,6 +6,18 @@ import { Platform, Prisma } from '@prisma/client';
 export class PlatformService {
  public constructor(private readonly prismaService: PrismaService) {}

+  public async createPlatform(data: Prisma.PlatformCreateInput) {
+    return this.prismaService.platform.create({
+      data
+    });
+  }
+
+  public async deletePlatform(
+    where: Prisma.PlatformWhereUniqueInput
+  ): Promise<Platform> {
+    return this.prismaService.platform.delete({ where });
+  }
+
  public async getPlatform(
    platformWhereUniqueInput: Prisma.PlatformWhereUniqueInput
  ): Promise<Platform> {
@ -56,12 +68,6 @@ export class PlatformService {
    });
  }

-  public async createPlatform(data: Prisma.PlatformCreateInput) {
-    return this.prismaService.platform.create({
-      data
-    });
-  }
-
  public async updatePlatform({
    data,
    where
@ -74,10 +80,4 @@ export class PlatformService {
      where
    });
  }
-
-  public async deletePlatform(
-    where: Prisma.PlatformWhereUniqueInput
-  ): Promise<Platform> {
-    return this.prismaService.platform.delete({ where });
-  }
 }
--- a/apps/api/src/app/portfolio/current-rate.service.spec.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts
@ -105,7 +105,6 @@ describe('CurrentRateService', () => {
      null,
      null,
      null,
-      null,
      null
    );
    marketDataService = new MarketDataService(null);
--- a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts
@ -1,4 +1,4 @@
-import { DataSource, Type as TypeOfOrder } from '@prisma/client';
+import { DataSource, Tag, Type as TypeOfOrder } from '@prisma/client';
 import Big from 'big.js';

 export interface PortfolioOrder {
@ -9,6 +9,7 @@ export interface PortfolioOrder {
  name: string;
  quantity: Big;
  symbol: string;
+  tags?: Tag[];
  type: TypeOfOrder;
  unitPrice: Big;
 }
--- a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts
@ -1,4 +1,4 @@
-import { DataSource } from '@prisma/client';
+import { DataSource, Tag } from '@prisma/client';
 import Big from 'big.js';

 export interface TransactionPointSymbol {
@ -9,5 +9,6 @@ export interface TransactionPointSymbol {
  investment: Big;
  quantity: Big;
  symbol: string;
+  tags?: Tag[];
  transactionCount: number;
 }
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@ -114,6 +114,7 @@ export class PortfolioCalculator {
          firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
          quantity: newQuantity,
          symbol: order.symbol,
+          tags: order.tags,
          transactionCount: oldAccumulatedSymbol.transactionCount + 1
        };
      } else {
@ -125,6 +126,7 @@ export class PortfolioCalculator {
          investment: unitPrice.mul(order.quantity).mul(factor),
          quantity: order.quantity.mul(factor),
          symbol: order.symbol,
+          tags: order.tags,
          transactionCount: 1
        };
      }
@ -492,6 +494,7 @@ export class PortfolioCalculator {
          : null,
        quantity: item.quantity,
        symbol: item.symbol,
+        tags: item.tags,
        transactionCount: item.transactionCount
      });

@ -781,7 +784,7 @@ export class PortfolioCalculator {
        );
      } else if (!currentPosition.quantity.eq(0)) {
        Logger.warn(
-          `Missing historical market data for symbol ${currentPosition.symbol}`,
+          `Missing historical market data for ${currentPosition.symbol} (${currentPosition.dataSource})`,
          'PortfolioCalculator'
        );
        hasErrors = true;
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -10,7 +10,10 @@ import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interc
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
+import {
+  DEFAULT_CURRENCY,
+  HEADER_KEY_IMPERSONATION
+} from '@ghostfolio/common/config';
 import {
  PortfolioDetails,
  PortfolioDividends,
@ -47,8 +50,6 @@ import { PortfolioService } from './portfolio.service';

@Controller('portfolio')
 export class PortfolioController {
-  private baseCurrency: string;
-
  public constructor(
    private readonly accessService: AccessService,
    private readonly apiService: ApiService,
@ -57,9 +58,7 @@ export class PortfolioController {
    private readonly portfolioService: PortfolioService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  @Get('details')
  @UseGuards(AuthGuard('jwt'))
@ -134,7 +133,7 @@ export class PortfolioController {
        portfolioPosition.netPerformance = null;
        portfolioPosition.quantity = null;
        portfolioPosition.valueInPercentage =
-          portfolioPosition.value / totalValue;
+          portfolioPosition.valueInBaseCurrency / totalValue;
      }

      for (const [name, { valueInBaseCurrency }] of Object.entries(accounts)) {
@ -161,10 +160,12 @@ export class PortfolioController {
        'emergencyFund',
        'excludedAccountsAndActivities',
        'fees',
+        'fireWealth',
        'items',
        'liabilities',
        'netWorth',
        'totalBuy',
+        'totalInvestment',
        'totalSell'
      ]);
    }
@ -172,11 +173,20 @@ export class PortfolioController {
    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
      holdings[symbol] = {
        ...portfolioPosition,
-        assetClass: hasDetails ? portfolioPosition.assetClass : undefined,
-        assetSubClass: hasDetails ? portfolioPosition.assetSubClass : undefined,
+        assetClass:
+          hasDetails || portfolioPosition.assetClass === 'CASH'
+            ? portfolioPosition.assetClass
+            : undefined,
+        assetSubClass:
+          hasDetails || portfolioPosition.assetSubClass === 'CASH'
+            ? portfolioPosition.assetSubClass
+            : undefined,
        countries: hasDetails ? portfolioPosition.countries : [],
        currency: hasDetails ? portfolioPosition.currency : undefined,
        markets: hasDetails ? portfolioPosition.markets : undefined,
+        marketsAdvanced: hasDetails
+          ? portfolioPosition.marketsAdvanced
+          : undefined,
        sectors: hasDetails ? portfolioPosition.sectors : []
      };
    }
@ -381,12 +391,14 @@ export class PortfolioController {
    @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId: string,
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('query') filterBySearchQuery?: string,
    @Query('range') dateRange: DateRange = 'max',
    @Query('tags') filterByTags?: string
  ): Promise<PortfolioPositions> {
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
      filterByAssetClasses,
+      filterBySearchQuery,
      filterByTags
    });

@ -437,15 +449,15 @@ export class PortfolioController {
        return this.exchangeRateDataService.toCurrency(
          portfolioPosition.quantity * portfolioPosition.marketPrice,
          portfolioPosition.currency,
-          this.request.user?.Settings?.settings.baseCurrency ??
-            this.baseCurrency
+          this.request.user?.Settings?.settings.baseCurrency ?? DEFAULT_CURRENCY
        );
      })
      .reduce((a, b) => a + b, 0);

    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
      portfolioPublicDetails.holdings[symbol] = {
-        allocationInPercentage: portfolioPosition.value / totalValue,
+        allocationInPercentage:
+          portfolioPosition.valueInBaseCurrency / totalValue,
        countries: hasDetails ? portfolioPosition.countries : [],
        currency: hasDetails ? portfolioPosition.currency : undefined,
        dataSource: portfolioPosition.dataSource,
@ -456,7 +468,7 @@ export class PortfolioController {
        sectors: hasDetails ? portfolioPosition.sectors : [],
        symbol: portfolioPosition.symbol,
        url: portfolioPosition.url,
-        valueInPercentage: portfolioPosition.value / totalValue
+        valueInPercentage: portfolioPosition.valueInBaseCurrency / totalValue
      };
    }

--- a/apps/api/src/app/portfolio/portfolio.module.ts
+++ b/apps/api/src/app/portfolio/portfolio.module.ts
@ -2,6 +2,7 @@ import { AccessModule } from '@ghostfolio/api/app/access/access.module';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@ -36,6 +37,7 @@ import { RulesService } from './rules.service';
    UserModule
  ],
  providers: [
+    AccountBalanceService,
    AccountService,
    CurrentRateService,
    PortfolioService,
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -10,13 +10,14 @@ import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rule
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
 import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
+import { EmergencyFundSetup } from '@ghostfolio/api/models/rules/emergency-fund/emergency-fund-setup';
 import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
+  DEFAULT_CURRENCY,
  EMERGENCY_FUND_TAG_ID,
  MAX_CHART_ITEMS,
  UNKNOWN_KEY
@ -42,7 +43,6 @@ import type {
  AccountWithValue,
  DateRange,
  GroupBy,
-  Market,
  OrderWithAccount,
  RequestWithUser,
  UserWithSettings
@ -51,18 +51,17 @@ import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import {
  Account,
+  Type as ActivityType,
  AssetClass,
  DataSource,
  Order,
  Platform,
  Prisma,
-  Tag,
-  Type as TypeOfOrder
+  Tag
 } from '@prisma/client';
 import Big from 'big.js';
 import {
  differenceInDays,
-  endOfToday,
  format,
  isAfter,
  isBefore,
@ -84,16 +83,15 @@ import {
 import { PortfolioCalculator } from './portfolio-calculator';
 import { RulesService } from './rules.service';

+const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json');
 const developedMarkets = require('../../assets/countries/developed-markets.json');
 const emergingMarkets = require('../../assets/countries/emerging-markets.json');
+const europeMarkets = require('../../assets/countries/europe-markets.json');

@Injectable()
 export class PortfolioService {
-  private baseCurrency: string;
-
  public constructor(
    private readonly accountService: AccountService,
-    private readonly configurationService: ConfigurationService,
    private readonly currentRateService: CurrentRateService,
    private readonly dataProviderService: DataProviderService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
@ -103,9 +101,7 @@ export class PortfolioService {
    private readonly rulesService: RulesService,
    private readonly symbolProfileService: SymbolProfileService,
    private readonly userService: UserService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  public async getAccounts({
    filters,
@ -469,9 +465,8 @@ export class PortfolioService {
      transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT)
    );
    const startDate = this.getStartDate(dateRange, portfolioStart);
-    const currentPositions = await portfolioCalculator.getCurrentPositions(
-      startDate
-    );
+    const currentPositions =
+      await portfolioCalculator.getCurrentPositions(startDate);

    const cashDetails = await this.accountService.getCashDetails({
      filters,
@ -538,30 +533,79 @@ export class PortfolioService {
      const symbolProfile = symbolProfileMap[item.symbol];
      const dataProviderResponse = dataProviderResponses[item.symbol];

-      const markets: { [key in Market]: number } = {
+      const markets: PortfolioPosition['markets'] = {
+        [UNKNOWN_KEY]: 0,
        developedMarkets: 0,
        emergingMarkets: 0,
        otherMarkets: 0
      };
+      const marketsAdvanced: PortfolioPosition['marketsAdvanced'] = {
+        [UNKNOWN_KEY]: 0,
+        asiaPacific: 0,
+        emergingMarkets: 0,
+        europe: 0,
+        japan: 0,
+        northAmerica: 0,
+        otherMarkets: 0
+      };

-      for (const country of symbolProfile.countries) {
-        if (developedMarkets.includes(country.code)) {
-          markets.developedMarkets = new Big(markets.developedMarkets)
-            .plus(country.weight)
-            .toNumber();
-        } else if (emergingMarkets.includes(country.code)) {
-          markets.emergingMarkets = new Big(markets.emergingMarkets)
-            .plus(country.weight)
-            .toNumber();
-        } else {
-          markets.otherMarkets = new Big(markets.otherMarkets)
-            .plus(country.weight)
-            .toNumber();
+      if (symbolProfile.countries.length > 0) {
+        for (const country of symbolProfile.countries) {
+          if (developedMarkets.includes(country.code)) {
+            markets.developedMarkets = new Big(markets.developedMarkets)
+              .plus(country.weight)
+              .toNumber();
+          } else if (emergingMarkets.includes(country.code)) {
+            markets.emergingMarkets = new Big(markets.emergingMarkets)
+              .plus(country.weight)
+              .toNumber();
+          } else {
+            markets.otherMarkets = new Big(markets.otherMarkets)
+              .plus(country.weight)
+              .toNumber();
+          }
+
+          if (country.code === 'JP') {
+            marketsAdvanced.japan = new Big(marketsAdvanced.japan)
+              .plus(country.weight)
+              .toNumber();
+          } else if (country.code === 'CA' || country.code === 'US') {
+            marketsAdvanced.northAmerica = new Big(marketsAdvanced.northAmerica)
+              .plus(country.weight)
+              .toNumber();
+          } else if (asiaPacificMarkets.includes(country.code)) {
+            marketsAdvanced.asiaPacific = new Big(marketsAdvanced.asiaPacific)
+              .plus(country.weight)
+              .toNumber();
+          } else if (emergingMarkets.includes(country.code)) {
+            marketsAdvanced.emergingMarkets = new Big(
+              marketsAdvanced.emergingMarkets
+            )
+              .plus(country.weight)
+              .toNumber();
+          } else if (europeMarkets.includes(country.code)) {
+            marketsAdvanced.europe = new Big(marketsAdvanced.europe)
+              .plus(country.weight)
+              .toNumber();
+          } else {
+            marketsAdvanced.otherMarkets = new Big(marketsAdvanced.otherMarkets)
+              .plus(country.weight)
+              .toNumber();
+          }
        }
+      } else {
+        markets[UNKNOWN_KEY] = new Big(markets[UNKNOWN_KEY])
+          .plus(value)
+          .toNumber();
+
+        marketsAdvanced[UNKNOWN_KEY] = new Big(marketsAdvanced[UNKNOWN_KEY])
+          .plus(value)
+          .toNumber();
      }

      holdings[item.symbol] = {
        markets,
+        marketsAdvanced,
        allocationInPercentage: filteredValueInBaseCurrency.eq(0)
          ? 0
          : value.div(filteredValueInBaseCurrency).toNumber(),
@ -583,9 +627,10 @@ export class PortfolioService {
        quantity: item.quantity.toNumber(),
        sectors: symbolProfile.sectors,
        symbol: item.symbol,
+        tags: item.tags,
        transactionCount: item.transactionCount,
        url: symbolProfile.url,
-        value: value.toNumber()
+        valueInBaseCurrency: value.toNumber()
      };
    }

@ -628,7 +673,7 @@ export class PortfolioService {
      const emergencyFundInCash = emergencyFund
        .minus(
          this.getEmergencyFundPositionsValueInBaseCurrency({
-            activities: orders
+            holdings
          })
        )
        .toNumber();
@ -645,7 +690,7 @@ export class PortfolioService {
      holdings[userCurrency] = {
        ...emergencyFundCashPositions[userCurrency],
        investment: emergencyFundInCash,
-        value: emergencyFundInCash
+        valueInBaseCurrency: emergencyFundInCash
      };
    }

@ -656,7 +701,7 @@ export class PortfolioService {
      balanceInBaseCurrency: cashDetails.balanceInBaseCurrency,
      emergencyFundPositionsValueInBaseCurrency:
        this.getEmergencyFundPositionsValueInBaseCurrency({
-          activities: orders
+          holdings
        })
    });

@ -742,6 +787,7 @@ export class PortfolioService {
        name: order.SymbolProfile?.name,
        quantity: new Big(order.quantity),
        symbol: order.SymbolProfile.symbol,
+        tags: order.tags,
        type: order.type,
        unitPrice: new Big(order.unitPrice)
      }));
@ -758,9 +804,8 @@ export class PortfolioService {
    const transactionPoints = portfolioCalculator.getTransactionPoints();

    const portfolioStart = parseDate(transactionPoints[0].date);
-    const currentPositions = await portfolioCalculator.getCurrentPositions(
-      portfolioStart
-    );
+    const currentPositions =
+      await portfolioCalculator.getCurrentPositions(portfolioStart);

    const position = currentPositions.positions.find(
      (item) => item.symbol === aSymbol
@ -969,6 +1014,9 @@ export class PortfolioService {
    filters?: Filter[];
    impersonationId: string;
  }): Promise<{ hasErrors: boolean; positions: Position[] }> {
+    const searchQuery = filters.find(({ type }) => {
+      return type === 'SEARCH_QUERY';
+    })?.id;
    const userId = await this.getUserId(impersonationId, this.request.user.id);

    const { portfolioOrders, transactionPoints } =
@ -994,13 +1042,12 @@ export class PortfolioService {

    const portfolioStart = parseDate(transactionPoints[0].date);
    const startDate = this.getStartDate(dateRange, portfolioStart);
-    const currentPositions = await portfolioCalculator.getCurrentPositions(
-      startDate
-    );
+    const currentPositions =
+      await portfolioCalculator.getCurrentPositions(startDate);

-    const positions = currentPositions.positions.filter(
-      (item) => !item.quantity.eq(0)
-    );
+    let positions = currentPositions.positions.filter(({ quantity }) => {
+      return !quantity.eq(0);
+    });

    const dataGatheringItems = positions.map(({ dataSource, symbol }) => {
      return {
@ -1023,12 +1070,25 @@ export class PortfolioService {
      symbolProfileMap[symbolProfile.symbol] = symbolProfile;
    }

+    if (searchQuery) {
+      positions = positions.filter(({ symbol }) => {
+        const enhancedSymbolProfile = symbolProfileMap[symbol];
+
+        return (
+          enhancedSymbolProfile.isin?.toLowerCase().startsWith(searchQuery) ||
+          enhancedSymbolProfile.name?.toLowerCase().startsWith(searchQuery) ||
+          enhancedSymbolProfile.symbol?.toLowerCase().startsWith(searchQuery)
+        );
+      });
+    }
+
    return {
      hasErrors: currentPositions.hasErrors,
      positions: positions.map((position) => {
        return {
          ...position,
          assetClass: symbolProfileMap[position.symbol].assetClass,
+          assetSubClass: symbolProfileMap[position.symbol].assetSubClass,
          averagePrice: new Big(position.averagePrice).toNumber(),
          grossPerformance: position.grossPerformance?.toNumber() ?? null,
          grossPerformancePercentage:
@ -1171,12 +1231,6 @@ export class PortfolioService {
        userId
      });

-    if (isEmpty(orders)) {
-      return {
-        rules: {}
-      };
-    }
-
    const portfolioCalculator = new PortfolioCalculator({
      currency: userCurrency,
      currentRateService: this.currentRateService,
@ -1185,10 +1239,11 @@ export class PortfolioService {

    portfolioCalculator.setTransactionPoints(transactionPoints);

-    const portfolioStart = parseDate(transactionPoints[0].date);
-    const currentPositions = await portfolioCalculator.getCurrentPositions(
-      portfolioStart
+    const portfolioStart = parseDate(
+      transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT)
    );
+    const currentPositions =
+      await portfolioCalculator.getCurrentPositions(portfolioStart);

    const positions = currentPositions.positions.filter(
      (item) => !item.quantity.eq(0)
@ -1207,33 +1262,48 @@ export class PortfolioService {
      userId
    });

+    const userSettings = <UserSettings>this.request.user.Settings.settings;
+
    return {
      rules: {
-        accountClusterRisk: await this.rulesService.evaluate(
-          [
-            new AccountClusterRiskCurrentInvestment(
-              this.exchangeRateDataService,
-              accounts
+        accountClusterRisk: isEmpty(orders)
+          ? undefined
+          : await this.rulesService.evaluate(
+              [
+                new AccountClusterRiskCurrentInvestment(
+                  this.exchangeRateDataService,
+                  accounts
+                ),
+                new AccountClusterRiskSingleAccount(
+                  this.exchangeRateDataService,
+                  accounts
+                )
+              ],
+              userSettings
            ),
-            new AccountClusterRiskSingleAccount(
+        currencyClusterRisk: isEmpty(orders)
+          ? undefined
+          : await this.rulesService.evaluate(
+              [
+                new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
+                  this.exchangeRateDataService,
+                  positions
+                ),
+                new CurrencyClusterRiskCurrentInvestment(
+                  this.exchangeRateDataService,
+                  positions
+                )
+              ],
+              userSettings
+            ),
+        emergencyFund: await this.rulesService.evaluate(
+          [
+            new EmergencyFundSetup(
              this.exchangeRateDataService,
-              accounts
+              userSettings.emergencyFund
            )
          ],
-          <UserSettings>this.request.user.Settings.settings
-        ),
-        currencyClusterRisk: await this.rulesService.evaluate(
-          [
-            new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
-              this.exchangeRateDataService,
-              positions
-            ),
-            new CurrencyClusterRiskCurrentInvestment(
-              this.exchangeRateDataService,
-              positions
-            )
-          ],
-          <UserSettings>this.request.user.Settings.settings
+          userSettings
        ),
        fees: await this.rulesService.evaluate(
          [
@ -1243,7 +1313,7 @@ export class PortfolioService {
              this.getFees({ userCurrency, activities: orders }).toNumber()
            )
          ],
-          <UserSettings>this.request.user.Settings.settings
+          userSettings
        )
      }
    };
@ -1278,7 +1348,7 @@ export class PortfolioService {

      if (cashPositions[account.currency]) {
        cashPositions[account.currency].investment += convertedBalance;
-        cashPositions[account.currency].value += convertedBalance;
+        cashPositions[account.currency].valueInBaseCurrency += convertedBalance;
      } else {
        cashPositions[account.currency] = this.getInitialCashPosition({
          balance: convertedBalance,
@ -1290,43 +1360,15 @@ export class PortfolioService {
    for (const symbol of Object.keys(cashPositions)) {
      // Calculate allocations for each currency
      cashPositions[symbol].allocationInPercentage = value.gt(0)
-        ? new Big(cashPositions[symbol].value).div(value).toNumber()
+        ? new Big(cashPositions[symbol].valueInBaseCurrency)
+            .div(value)
+            .toNumber()
        : 0;
    }

    return cashPositions;
  }

-  private getDividend({
-    activities,
-    date = new Date(0),
-    userCurrency
-  }: {
-    activities: OrderWithAccount[];
-    date?: Date;
-    userCurrency: string;
-  }) {
-    return activities
-      .filter((activity) => {
-        // Filter out all activities before given date (drafts) and type dividend
-        return (
-          isBefore(date, new Date(activity.date)) &&
-          activity.type === TypeOfOrder.DIVIDEND
-        );
-      })
-      .map(({ quantity, SymbolProfile, unitPrice }) => {
-        return this.exchangeRateDataService.toCurrency(
-          new Big(quantity).mul(unitPrice).toNumber(),
-          SymbolProfile.currency,
-          userCurrency
-        );
-      })
-      .reduce(
-        (previous, current) => new Big(previous).plus(current),
-        new Big(0)
-      );
-  }
-
  private getDividendsByGroup({
    dividends,
    groupBy
@ -1390,13 +1432,13 @@ export class PortfolioService {
  }

  private getEmergencyFundPositionsValueInBaseCurrency({
-    activities
+    holdings
  }: {
-    activities: Activity[];
+    holdings: PortfolioDetails['holdings'];
  }) {
-    const emergencyFundOrders = activities.filter((activity) => {
+    const emergencyFundHoldings = Object.values(holdings).filter(({ tags }) => {
      return (
-        activity.tags?.some(({ id }) => {
+        tags?.some(({ id }) => {
          return id === EMERGENCY_FUND_TAG_ID;
        }) ?? false
      );
@ -1404,18 +1446,9 @@ export class PortfolioService {

    let valueInBaseCurrencyOfEmergencyFundPositions = new Big(0);

-    for (const order of emergencyFundOrders) {
-      if (order.type === 'BUY') {
-        valueInBaseCurrencyOfEmergencyFundPositions =
-          valueInBaseCurrencyOfEmergencyFundPositions.plus(
-            order.valueInBaseCurrency
-          );
-      } else if (order.type === 'SELL') {
-        valueInBaseCurrencyOfEmergencyFundPositions =
-          valueInBaseCurrencyOfEmergencyFundPositions.minus(
-            order.valueInBaseCurrency
-          );
-      }
+    for (const { valueInBaseCurrency } of emergencyFundHoldings) {
+      valueInBaseCurrencyOfEmergencyFundPositions =
+        valueInBaseCurrencyOfEmergencyFundPositions.plus(valueInBaseCurrency);
    }

    return valueInBaseCurrencyOfEmergencyFundPositions.toNumber();
@ -1474,51 +1507,12 @@ export class PortfolioService {
      quantity: 0,
      sectors: [],
      symbol: currency,
+      tags: [],
      transactionCount: 0,
-      value: balance
+      valueInBaseCurrency: balance
    };
  }

-  private getItems(activities: OrderWithAccount[], date = new Date(0)) {
-    return activities
-      .filter((activity) => {
-        // Filter out all activities before given date (drafts) and type item
-        return (
-          isBefore(date, new Date(activity.date)) &&
-          activity.type === TypeOfOrder.ITEM
-        );
-      })
-      .map(({ quantity, SymbolProfile, unitPrice }) => {
-        return this.exchangeRateDataService.toCurrency(
-          new Big(quantity).mul(unitPrice).toNumber(),
-          SymbolProfile.currency,
-          this.request.user.Settings.settings.baseCurrency
-        );
-      })
-      .reduce(
-        (previous, current) => new Big(previous).plus(current),
-        new Big(0)
-      );
-  }
-
-  private getLiabilities(activities: OrderWithAccount[]) {
-    return activities
-      .filter(({ type }) => {
-        return type === TypeOfOrder.LIABILITY;
-      })
-      .map(({ quantity, SymbolProfile, unitPrice }) => {
-        return this.exchangeRateDataService.toCurrency(
-          new Big(quantity).mul(unitPrice).toNumber(),
-          SymbolProfile.currency,
-          this.request.user.Settings.settings.baseCurrency
-        );
-      })
-      .reduce(
-        (previous, current) => new Big(previous).plus(current),
-        new Big(0)
-      );
-  }
-
  private getStartDate(aDateRange: DateRange, portfolioStart: Date) {
    switch (aDateRange) {
      case '1d':
@ -1607,9 +1601,10 @@ export class PortfolioService {
      return account?.isExcluded ?? false;
    });

-    const dividend = this.getDividend({
+    const dividend = this.getSumOfActivityType({
      activities,
-      userCurrency
+      userCurrency,
+      activityType: 'DIVIDEND'
    }).toNumber();
    const emergencyFund = new Big(
      Math.max(
@ -1619,20 +1614,49 @@ export class PortfolioService {
    );
    const fees = this.getFees({ activities, userCurrency }).toNumber();
    const firstOrderDate = activities[0]?.date;
-    const items = this.getItems(activities).toNumber();
-    const liabilities = this.getLiabilities(activities).toNumber();
+    const interest = this.getSumOfActivityType({
+      activities,
+      userCurrency,
+      activityType: 'INTEREST'
+    }).toNumber();
+    const items = this.getSumOfActivityType({
+      activities,
+      userCurrency,
+      activityType: 'ITEM'
+    }).toNumber();
+    const liabilities = this.getSumOfActivityType({
+      activities,
+      userCurrency,
+      activityType: 'LIABILITY'
+    }).toNumber();

-    const totalBuy = this.getTotalByType(activities, userCurrency, 'BUY');
-    const totalSell = this.getTotalByType(activities, userCurrency, 'SELL');
+    const totalBuy = this.getSumOfActivityType({
+      activities,
+      userCurrency,
+      activityType: 'BUY'
+    }).toNumber();
+    const totalSell = this.getSumOfActivityType({
+      activities,
+      userCurrency,
+      activityType: 'SELL'
+    }).toNumber();

    const cash = new Big(balanceInBaseCurrency)
      .minus(emergencyFund)
      .plus(emergencyFundPositionsValueInBaseCurrency)
      .toNumber();
    const committedFunds = new Big(totalBuy).minus(totalSell);
-    const totalOfExcludedActivities = new Big(
-      this.getTotalByType(excludedActivities, userCurrency, 'BUY')
-    ).minus(this.getTotalByType(excludedActivities, userCurrency, 'SELL'));
+    const totalOfExcludedActivities = this.getSumOfActivityType({
+      userCurrency,
+      activities: excludedActivities,
+      activityType: 'BUY'
+    }).minus(
+      this.getSumOfActivityType({
+        userCurrency,
+        activities: excludedActivities,
+        activityType: 'SELL'
+      })
+    );

    const cashDetailsWithExcludedAccounts =
      await this.accountService.getCashDetails({
@ -1679,19 +1703,62 @@ export class PortfolioService {
      excludedAccountsAndActivities,
      fees,
      firstOrderDate,
+      interest,
      items,
      liabilities,
      netWorth,
      totalBuy,
      totalSell,
      committedFunds: committedFunds.toNumber(),
-      emergencyFund: emergencyFund.toNumber(),
+      emergencyFund: {
+        assets: emergencyFundPositionsValueInBaseCurrency,
+        cash: emergencyFund
+          .minus(emergencyFundPositionsValueInBaseCurrency)
+          .toNumber(),
+        total: emergencyFund.toNumber()
+      },
+      fireWealth: new Big(performanceInformation.performance.currentValue)
+        .minus(emergencyFundPositionsValueInBaseCurrency)
+        .toNumber(),
      ordersCount: activities.filter(({ type }) => {
        return type === 'BUY' || type === 'SELL';
      }).length
    };
  }

+  private getSumOfActivityType({
+    activities,
+    activityType,
+    date = new Date(0),
+    userCurrency
+  }: {
+    activities: OrderWithAccount[];
+    activityType: ActivityType;
+    date?: Date;
+    userCurrency: string;
+  }) {
+    return activities
+      .filter((activity) => {
+        // Filter out all activities before given date (drafts) and
+        // activity type
+        return (
+          isBefore(date, new Date(activity.date)) &&
+          activity.type === activityType
+        );
+      })
+      .map(({ quantity, SymbolProfile, unitPrice }) => {
+        return this.exchangeRateDataService.toCurrency(
+          new Big(quantity).mul(unitPrice).toNumber(),
+          SymbolProfile.currency,
+          userCurrency
+        );
+      })
+      .reduce(
+        (previous, current) => new Big(previous).plus(current),
+        new Big(0)
+      );
+  }
+
  private async getTransactionPoints({
    filters,
    includeDrafts = false,
@ -1708,7 +1775,7 @@ export class PortfolioService {
    portfolioOrders: PortfolioOrder[];
  }> {
    const userCurrency =
-      this.request.user?.Settings?.settings.baseCurrency ?? this.baseCurrency;
+      this.request.user?.Settings?.settings.baseCurrency ?? DEFAULT_CURRENCY;

    const orders = await this.orderService.getOrders({
      filters,
@ -1737,6 +1804,7 @@ export class PortfolioService {
      name: order.SymbolProfile?.name,
      quantity: new Big(order.quantity),
      symbol: order.SymbolProfile.symbol,
+      tags: order.tags,
      type: order.type,
      unitPrice: new Big(
        this.exchangeRateDataService.toCurrency(
@ -1762,6 +1830,21 @@ export class PortfolioService {
    };
  }

+  private getUserCurrency(aUser: UserWithSettings) {
+    return (
+      aUser.Settings?.settings.baseCurrency ??
+      this.request.user?.Settings?.settings.baseCurrency ??
+      DEFAULT_CURRENCY
+    );
+  }
+
+  private async getUserId(aImpersonationId: string, aUserId: string) {
+    const impersonationUserId =
+      await this.impersonationService.validateImpersonationId(aImpersonationId);
+
+    return impersonationUserId || aUserId;
+  }
+
  private async getValueOfAccountsAndPlatforms({
    filters = [],
    orders,
@ -1777,12 +1860,12 @@ export class PortfolioService {
    userId: string;
    withExcludedAccounts?: boolean;
  }) {
-    const ordersOfTypeItem = await this.orderService.getOrders({
+    const ordersOfTypeItemOrLiability = await this.orderService.getOrders({
      filters,
      userCurrency,
      userId,
      withExcludedAccounts,
-      types: ['ITEM']
+      types: ['ITEM', 'LIABILITY']
    });

    const accounts: PortfolioDetails['accounts'] = {};
@ -1822,13 +1905,14 @@ export class PortfolioService {
        return accountId === account.id;
      });

-      const ordersOfTypeItemByAccount = ordersOfTypeItem.filter(
-        ({ accountId }) => {
+      const ordersOfTypeItemOrLiabilityByAccount =
+        ordersOfTypeItemOrLiability.filter(({ accountId }) => {
          return accountId === account.id;
-        }
-      );
+        });

-      ordersByAccount = ordersByAccount.concat(ordersOfTypeItemByAccount);
+      ordersByAccount = ordersByAccount.concat(
+        ordersOfTypeItemOrLiabilityByAccount
+      );

      accounts[account.id] = {
        balance: account.balance,
@ -1868,7 +1952,7 @@ export class PortfolioService {
            order.unitPrice ??
            0);

-        if (order.type === 'SELL') {
+        if (order.type === 'LIABILITY' || order.type === 'SELL') {
          currentValueOfSymbolInBaseCurrency *= -1;
        }

@ -1904,38 +1988,4 @@ export class PortfolioService {

    return { accounts, platforms };
  }
-
-  private getTotalByType(
-    orders: OrderWithAccount[],
-    currency: string,
-    type: TypeOfOrder
-  ) {
-    return orders
-      .filter(
-        (order) => !isAfter(order.date, endOfToday()) && order.type === type
-      )
-      .map((order) => {
-        return this.exchangeRateDataService.toCurrency(
-          order.quantity * order.unitPrice,
-          order.SymbolProfile.currency,
-          currency
-        );
-      })
-      .reduce((previous, current) => previous + current, 0);
-  }
-
-  private getUserCurrency(aUser: UserWithSettings) {
-    return (
-      aUser.Settings?.settings.baseCurrency ??
-      this.request.user?.Settings?.settings.baseCurrency ??
-      this.baseCurrency
-    );
-  }
-
-  private async getUserId(aImpersonationId: string, aUserId: string) {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(aImpersonationId);
-
-    return impersonationUserId || aUserId;
-  }
 }
--- a/apps/api/src/app/redis-cache/interfaces/redis-cache.interface.ts
+++ b/apps/api/src/app/redis-cache/interfaces/redis-cache.interface.ts
@ -0,0 +1,7 @@
+import { Cache } from 'cache-manager';
+
+import type { RedisStore } from './redis-store.interface';
+
+export interface RedisCache extends Cache {
+  store: RedisStore;
+}
--- a/apps/api/src/app/redis-cache/interfaces/redis-store.interface.ts
+++ b/apps/api/src/app/redis-cache/interfaces/redis-store.interface.ts
@ -0,0 +1,8 @@
+import { Store } from 'cache-manager';
+import { createClient } from 'redis';
+
+export interface RedisStore extends Store {
+  getClient: () => ReturnType<typeof createClient>;
+  isCacheableValue: (value: any) => boolean;
+  name: 'redis';
+}
--- a/apps/api/src/app/redis-cache/redis-cache.module.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.module.ts
@ -1,7 +1,9 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-import { CacheManagerOptions, CacheModule, Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
+import { Module } from '@nestjs/common';
 import * as redisStore from 'cache-manager-redis-store';
+import type { RedisClientOptions } from 'redis';

 import { RedisCacheService } from './redis-cache.service';

@ -11,7 +13,7 @@ import { RedisCacheService } from './redis-cache.service';
      imports: [ConfigurationModule],
      inject: [ConfigurationService],
      useFactory: async (configurationService: ConfigurationService) => {
-        return <CacheManagerOptions>{
+        return <RedisClientOptions>{
          host: configurationService.get('REDIS_HOST'),
          max: configurationService.get('MAX_ITEM_IN_CACHE'),
          password: configurationService.get('REDIS_PASSWORD'),
--- a/apps/api/src/app/redis-cache/redis-cache.service.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.service.ts
@ -1,21 +1,30 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
-import { Cache } from 'cache-manager';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Inject, Injectable, Logger } from '@nestjs/common';
+
+import type { RedisCache } from './interfaces/redis-cache.interface';

@Injectable()
 export class RedisCacheService {
  public constructor(
-    @Inject(CACHE_MANAGER) private readonly cache: Cache,
+    @Inject(CACHE_MANAGER) private readonly cache: RedisCache,
    private readonly configurationService: ConfigurationService
-  ) {}
+  ) {
+    const client = cache.store.getClient();
+
+    client.on('error', (error) => {
+      Logger.error(error, 'RedisCacheService');
+    });
+  }

  public async get(key: string): Promise<string> {
    return await this.cache.get(key);
  }

  public getQuoteKey({ dataSource, symbol }: UniqueAsset) {
-    return `quote-${dataSource}-${symbol}`;
+    return `quote-${getAssetProfileIdentifier({ dataSource, symbol })}`;
  }

  public async remove(key: string) {
@ -27,8 +36,10 @@ export class RedisCacheService {
  }

  public async set(key: string, value: string, ttlInSeconds?: number) {
-    await this.cache.set(key, value, {
-      ttl: ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
-    });
+    await this.cache.set(
+      key,
+      value,
+      ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
+    );
  }
 }
--- a/apps/api/src/app/sitemap/sitemap.controller.ts
+++ b/apps/api/src/app/sitemap/sitemap.controller.ts
@ -0,0 +1,36 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import {
+  DATE_FORMAT,
+  getYesterday,
+  interpolate
+} from '@ghostfolio/common/helper';
+import { Controller, Get, Res, VERSION_NEUTRAL, Version } from '@nestjs/common';
+import { format } from 'date-fns';
+import { Response } from 'express';
+
+@Controller('sitemap.xml')
+export class SitemapController {
+  public sitemapXml = '';
+
+  public constructor() {
+    try {
+      this.sitemapXml = fs.readFileSync(
+        path.join(__dirname, 'assets', 'sitemap.xml'),
+        'utf8'
+      );
+    } catch {}
+  }
+
+  @Get()
+  @Version(VERSION_NEUTRAL)
+  public async flushCache(@Res() response: Response): Promise<void> {
+    response.setHeader('content-type', 'application/xml');
+    response.send(
+      interpolate(this.sitemapXml, {
+        currentDate: format(getYesterday(), DATE_FORMAT)
+      })
+    );
+  }
+}
--- a/apps/api/src/app/sitemap/sitemap.module.ts
+++ b/apps/api/src/app/sitemap/sitemap.module.ts
@ -0,0 +1,24 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
+import { Module } from '@nestjs/common';
+
+import { SitemapController } from './sitemap.controller';
+
+@Module({
+  controllers: [SitemapController],
+  imports: [
+    ConfigurationModule,
+    DataGatheringModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
+    PrismaModule,
+    RedisCacheModule,
+    SymbolProfileModule
+  ]
+})
+export class SitemapModule {}
--- a/apps/api/src/app/subscription/subscription.service.ts
+++ b/apps/api/src/app/subscription/subscription.service.ts
@ -93,9 +93,8 @@ export class SubscriptionService {

  public async createSubscriptionViaStripe(aCheckoutSessionId: string) {
    try {
-      const session = await this.stripe.checkout.sessions.retrieve(
-        aCheckoutSessionId
-      );
+      const session =
+        await this.stripe.checkout.sessions.retrieve(aCheckoutSessionId);

      await this.createSubscription({
        price: session.amount_total / 100,
--- a/apps/api/src/app/symbol/symbol.controller.ts
+++ b/apps/api/src/app/symbol/symbol.controller.ts
@ -15,6 +15,7 @@ import {
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { DataSource } from '@prisma/client';
+import { parseISO } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 import { isDate, isEmpty } from 'lodash';

@ -93,7 +94,7 @@ export class SymbolController {
    @Param('dateString') dateString: string,
    @Param('symbol') symbol: string
  ): Promise<IDataProviderHistoricalResponse> {
-    const date = new Date(dateString);
+    const date = parseISO(dateString);

    if (!isDate(date)) {
      throw new HttpException(
--- a/apps/api/src/app/tag/create-tag.dto.ts
+++ b/apps/api/src/app/tag/create-tag.dto.ts
@ -0,0 +1,6 @@
+import { IsString } from 'class-validator';
+
+export class CreateTagDto {
+  @IsString()
+  name: string;
+}
--- a/apps/api/src/app/tag/tag.controller.ts
+++ b/apps/api/src/app/tag/tag.controller.ts
@ -0,0 +1,104 @@
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  HttpException,
+  Inject,
+  Param,
+  Post,
+  Put,
+  UseGuards
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { AuthGuard } from '@nestjs/passport';
+import { Tag } from '@prisma/client';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
+
+import { CreateTagDto } from './create-tag.dto';
+import { TagService } from './tag.service';
+import { UpdateTagDto } from './update-tag.dto';
+
+@Controller('tag')
+export class TagController {
+  public constructor(
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly tagService: TagService
+  ) {}
+
+  @Get()
+  @UseGuards(AuthGuard('jwt'))
+  public async getTags() {
+    return this.tagService.getTagsWithActivityCount();
+  }
+
+  @Post()
+  @UseGuards(AuthGuard('jwt'))
+  public async createTag(@Body() data: CreateTagDto): Promise<Tag> {
+    if (!hasPermission(this.request.user.permissions, permissions.createTag)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.tagService.createTag(data);
+  }
+
+  @Put(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async updateTag(@Param('id') id: string, @Body() data: UpdateTagDto) {
+    if (!hasPermission(this.request.user.permissions, permissions.updateTag)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const originalTag = await this.tagService.getTag({
+      id
+    });
+
+    if (!originalTag) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.tagService.updateTag({
+      data: {
+        ...data
+      },
+      where: {
+        id
+      }
+    });
+  }
+
+  @Delete(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async deleteTag(@Param('id') id: string) {
+    if (!hasPermission(this.request.user.permissions, permissions.deleteTag)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const originalTag = await this.tagService.getTag({
+      id
+    });
+
+    if (!originalTag) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.tagService.deleteTag({ id });
+  }
+}
--- a/apps/api/src/app/tag/tag.module.ts
+++ b/apps/api/src/app/tag/tag.module.ts
@ -0,0 +1,13 @@
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { Module } from '@nestjs/common';
+
+import { TagController } from './tag.controller';
+import { TagService } from './tag.service';
+
+@Module({
+  controllers: [TagController],
+  exports: [TagService],
+  imports: [PrismaModule],
+  providers: [TagService]
+})
+export class TagModule {}
--- a/apps/api/src/app/tag/tag.service.ts
+++ b/apps/api/src/app/tag/tag.service.ts
@ -0,0 +1,79 @@
+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { Injectable } from '@nestjs/common';
+import { Prisma, Tag } from '@prisma/client';
+
+@Injectable()
+export class TagService {
+  public constructor(private readonly prismaService: PrismaService) {}
+
+  public async createTag(data: Prisma.TagCreateInput) {
+    return this.prismaService.tag.create({
+      data
+    });
+  }
+
+  public async deleteTag(where: Prisma.TagWhereUniqueInput): Promise<Tag> {
+    return this.prismaService.tag.delete({ where });
+  }
+
+  public async getTag(
+    tagWhereUniqueInput: Prisma.TagWhereUniqueInput
+  ): Promise<Tag> {
+    return this.prismaService.tag.findUnique({
+      where: tagWhereUniqueInput
+    });
+  }
+
+  public async getTags({
+    cursor,
+    orderBy,
+    skip,
+    take,
+    where
+  }: {
+    cursor?: Prisma.TagWhereUniqueInput;
+    orderBy?: Prisma.TagOrderByWithRelationInput;
+    skip?: number;
+    take?: number;
+    where?: Prisma.TagWhereInput;
+  } = {}) {
+    return this.prismaService.tag.findMany({
+      cursor,
+      orderBy,
+      skip,
+      take,
+      where
+    });
+  }
+
+  public async getTagsWithActivityCount() {
+    const tagsWithOrderCount = await this.prismaService.tag.findMany({
+      include: {
+        _count: {
+          select: { orders: true }
+        }
+      }
+    });
+
+    return tagsWithOrderCount.map(({ _count, id, name }) => {
+      return {
+        id,
+        name,
+        activityCount: _count.orders
+      };
+    });
+  }
+
+  public async updateTag({
+    data,
+    where
+  }: {
+    data: Prisma.TagUpdateInput;
+    where: Prisma.TagWhereUniqueInput;
+  }): Promise<Tag> {
+    return this.prismaService.tag.update({
+      data,
+      where
+    });
+  }
+}
--- a/apps/api/src/app/tag/update-tag.dto.ts
+++ b/apps/api/src/app/tag/update-tag.dto.ts
@ -0,0 +1,9 @@
+import { IsString } from 'class-validator';
+
+export class UpdateTagDto {
+  @IsString()
+  id: string;
+
+  @IsString()
+  name: string;
+}
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -4,7 +4,11 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration/con
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
-import { PROPERTY_IS_READ_ONLY_MODE, locale } from '@ghostfolio/common/config';
+import {
+  DEFAULT_CURRENCY,
+  PROPERTY_IS_READ_ONLY_MODE,
+  locale
+} from '@ghostfolio/common/config';
 import { User as IUser, UserSettings } from '@ghostfolio/common/interfaces';
 import {
  getPermissions,
@ -14,24 +18,23 @@ import {
 import { UserWithSettings } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { Prisma, Role, User } from '@prisma/client';
-import { sortBy } from 'lodash';
+import { differenceInDays } from 'date-fns';
+import { sortBy, without } from 'lodash';

 const crypto = require('crypto');

@Injectable()
 export class UserService {
-  public static DEFAULT_CURRENCY = 'USD';
-
-  private baseCurrency: string;
-
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
    private readonly subscriptionService: SubscriptionService,
    private readonly tagService: TagService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  ) {}
+
+  public async count(args?: Prisma.UserCountArgs) {
+    return this.prismaService.user.count(args);
  }

  public async getUser(
@ -144,8 +147,7 @@ export class UserService {

    // Set default value for base currency
    if (!(user.Settings.settings as UserSettings)?.baseCurrency) {
-      (user.Settings.settings as UserSettings).baseCurrency =
-        UserService.DEFAULT_CURRENCY;
+      (user.Settings.settings as UserSettings).baseCurrency = DEFAULT_CURRENCY;
    }

    // Set default value for date range
@ -161,15 +163,45 @@ export class UserService {

    let currentPermissions = getPermissions(user.role);

+    if (!(user.Settings.settings as UserSettings).isExperimentalFeatures) {
+      currentPermissions = without(
+        currentPermissions,
+        permissions.accessAssistant
+      );
+    }
+
    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
      user.subscription =
        this.subscriptionService.getSubscription(Subscription);

-      if (
-        Analytics?.activityCount % 10 === 0 &&
-        user.subscription?.type === 'Basic'
-      ) {
-        currentPermissions.push(permissions.enableSubscriptionInterstitial);
+      if (user.subscription?.type === 'Basic') {
+        const daysSinceRegistration = differenceInDays(
+          new Date(),
+          user.createdAt
+        );
+        let frequency = 20;
+
+        if (daysSinceRegistration > 180) {
+          frequency = 3;
+        } else if (daysSinceRegistration > 60) {
+          frequency = 5;
+        } else if (daysSinceRegistration > 30) {
+          frequency = 10;
+        } else if (daysSinceRegistration > 15) {
+          frequency = 15;
+        }
+
+        if (Analytics?.activityCount % frequency === 1) {
+          currentPermissions.push(permissions.enableSubscriptionInterstitial);
+        }
+
+        currentPermissions = without(
+          currentPermissions,
+          permissions.createAccess
+        );
+
+        // Reset benchmark
+        user.Settings.settings.benchmark = undefined;
      }

      if (user.subscription?.type === 'Premium') {
@ -247,7 +279,7 @@ export class UserService {
        ...data,
        Account: {
          create: {
-            currency: this.baseCurrency,
+            currency: DEFAULT_CURRENCY,
            isDefault: true,
            name: 'Default Account'
          }
@ -255,7 +287,7 @@ export class UserService {
        Settings: {
          create: {
            settings: {
-              currency: this.baseCurrency
+              currency: DEFAULT_CURRENCY
            }
          }
        }
--- a/apps/api/src/assets/countries/asia-pacific-markets.json
+++ b/apps/api/src/assets/countries/asia-pacific-markets.json
@ -0,0 +1 @@
+["AU", "HK", "NZ", "SG"]
--- a/apps/api/src/assets/countries/europe-markets.json
+++ b/apps/api/src/assets/countries/europe-markets.json
@ -0,0 +1,19 @@
+[
+  "AT",
+  "BE",
+  "CH",
+  "DE",
+  "DK",
+  "ES",
+  "FI",
+  "FR",
+  "GB",
+  "IE",
+  "IL",
+  "IT",
+  "LU",
+  "NL",
+  "NO",
+  "PT",
+  "SE"
+]
--- a/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
+++ b/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
@ -51,7 +51,9 @@
  "3FT": "ThreeFold Token",
  "3ULL": "3ULL Coin",
  "3XD": "3DChain",
+  "420CHAN": "420chan",
  "4ART": "4ART Coin",
+  "4CHAN": "4Chan",
  "4JNET": "4JNET",
  "77G": "GraphenTech",
  "7E": "7ELEVEN",
@ -60,6 +62,7 @@
  "8BT": "8 Circuit Studios",
  "8PAY": "8Pay",
  "8X8": "8X8 Protocol",
+  "9GAG": "9GAG",
  "A5T": "Alpha5",
  "AAA": "Moon Rabbit",
  "AAB": "AAX Token",
@ -101,6 +104,7 @@
  "ACN": "AvonCoin",
  "ACOIN": "ACoin",
  "ACP": "Anarchists Prime",
+  "ACQ": "Acquire.Fi",
  "ACS": "Access Protocol",
  "ACT": "Achain",
  "ACTIN": "Actinium",
@ -180,7 +184,7 @@
  "AGX": "Agricoin",
  "AHOO": "Ahoolee",
  "AHT": "AhaToken",
-  "AI": "Multiverse",
+  "AI": "AiDoge",
  "AIB": "AdvancedInternetBlock",
  "AIBB": "AiBB",
  "AIBK": "AIB Utility Token",
@ -213,6 +217,7 @@
  "AKA": "Akroma",
  "AKITA": "Akita Inu",
  "AKN": "Akoin",
+  "AKNC": "Aave KNC v1",
  "AKRO": "Akropolis",
  "AKT": "Akash Network",
  "AKTIO": "AKTIO Coin",
@ -237,12 +242,14 @@
  "ALIC": "AliCoin",
  "ALICE": "My Neighbor Alice",
  "ALIEN": "AlienCoin",
+  "ALINK": "Aave LINK v1",
  "ALIS": "ALISmedia",
  "ALITA": "Alita Network",
  "ALIX": "AlinX",
  "ALKI": "Alkimi",
  "ALLBI": "ALL BEST ICO",
  "ALLEY": "NFT Alley",
+  "ALLIN": "All in",
  "ALN": "Aluna",
  "ALOHA": "Aloha",
  "ALP": "Alphacon",
@ -410,12 +417,14 @@
  "ARIX": "Arix",
  "ARK": "ARK",
  "ARKER": "Arker",
+  "ARKM": "Arkham",
  "ARKN": "Ark Rivals",
  "ARM": "Armory Coin",
  "ARMOR": "ARMOR",
  "ARMR": "ARMR",
  "ARMS": "2Acoin",
  "ARNA": "ARNA Panacea",
+  "ARNM": "Arenum",
  "ARNO": "ARNO",
  "ARNX": "Aeron",
  "ARNXM": "Armor NXM",
@ -472,6 +481,7 @@
  "ASTO": "Altered State Token",
  "ASTON": "Aston",
  "ASTR": "Astar",
+  "ASTRAFER": "Astrafer",
  "ASTRAL": "Astral",
  "ASTRO": "AstroSwap",
  "ASTROC": "Astroport Classic",
@ -531,6 +541,7 @@
  "AURY": "Aurory",
  "AUSCM": "Auric Network",
  "AUSD": "Appeal dollar",
+  "AUSDC": "Aave USDC v1",
  "AUT": "Autoria",
  "AUTHORSHIP": "Authorship",
  "AUTO": "Auto",
@ -612,6 +623,7 @@
  "BACK": "DollarBack",
  "BACOIN": "BACoin",
  "BACON": "BaconDAO (BACON)",
+  "BAD": "Bad Idea AI",
  "BADGER": "Badger DAO",
  "BAG": "BondAppetit",
  "BAGS": "Basis Gold Share",
@ -662,6 +674,7 @@
  "BBCT": "TraDove B2BCoin",
  "BBDT": "BBD Token",
  "BBF": "Bubblefong",
+  "BBFT": "Block Busters Tech Token",
  "BBG": "BigBang",
  "BBGC": "BigBang Game",
  "BBI": "BelugaPay",
@ -725,6 +738,7 @@
  "BDX": "Beldex",
  "BDY": "Buddy DAO",
  "BEACH": "BeachCoin",
+  "BEAI": "BeNFT Solutions",
  "BEAM": "Beam",
  "BEAN": "BeanCash",
  "BEAST": "CryptoBeast",
@ -806,6 +820,7 @@
  "BIDR": "Binance IDR Stable Coin",
  "BIFI": "Beefy.Finance",
  "BIFIF": "BiFi",
+  "BIG": "Big Eyes",
  "BIGHAN": "BighanCoin",
  "BIGSB": "BigShortBets",
  "BIGUP": "BigUp",
@ -1090,6 +1105,7 @@
  "BRNK": "Brank",
  "BRNX": "Bronix",
  "BRO": "Bitradio",
+  "BROCK": "Bitrock",
  "BRONZ": "BitBronze",
  "BRT": "Bikerush",
  "BRTR": "Barter",
@ -1226,7 +1242,7 @@
  "BULL": "Bullieverse",
  "BULLC": "BuySell",
  "BULLION": "BullionFX",
-  "BULLS": "BullshitCoin",
+  "BULLS": "Bull Coin",
  "BULLSH": "Bullshit Inu",
  "BUMN": "BUMooN",
  "BUMP": "Bumper",
@ -1277,6 +1293,7 @@
  "BZKY": "Bizkey",
  "BZL": "BZLCoin",
  "BZNT": "Bezant",
+  "BZR": "Bazaars",
  "BZRX": "bZx Protocol",
  "BZX": "Bitcoin Zero",
  "BZZ": "Swarmv",
@ -1319,8 +1336,10 @@
  "CAP": "BottleCaps",
  "CAPD": "Capdax",
  "CAPP": "Cappasity",
+  "CAPRICOIN": "CapriCoin",
  "CAPS": "Ternoa",
  "CAPT": "Bitcoin Captain",
+  "CAPTAINPLANET": "Captain Planet",
  "CAR": "CarBlock",
  "CARAT": "Carats Token",
  "CARBON": "Carboncoin",
@ -1478,6 +1497,7 @@
  "CHECKR": "CheckerChain",
  "CHECOIN": "CheCoin",
  "CHEDDA": "Chedda",
+  "CHEEL": "Cheelee",
  "CHEESE": "CHEESE",
  "CHEESUS": "Cheesus",
  "CHEQ": "CHEQD Network",
@ -1520,7 +1540,8 @@
  "CHX": "Own",
  "CHY": "Concern Poverty Chain",
  "CHZ": "Chiliz",
-  "CIC": "CIChain",
+  "CIC": "Crazy Internet Coin",
+  "CICHAIN": "CIChain",
  "CIF": "Crypto Improvement Fund",
  "CIM": "COINCOME",
  "CIN": "CinderCoin",
@ -1630,7 +1651,6 @@
  "COB": "Cobinhood",
  "COC": "Coin of the champions",
  "COCK": "Shibacock",
-  "COCOS": "COCOS BCX",
  "CODEO": "Codeo Token",
  "CODEX": "CODEX Finance",
  "CODI": "Codi Finance",
@ -1659,7 +1679,7 @@
  "COLX": "ColossusCoinXT",
  "COM": "Coliseum",
  "COMB": "Combo",
-  "COMBO": "Furucombo",
+  "COMBO": "COMBO",
  "COMFI": "CompliFi",
  "COMM": "Community Coin",
  "COMMUNITYCOIN": "Community Coin",
@ -1672,7 +1692,6 @@
  "CONI": "CoinBene",
  "CONS": "ConSpiracy Coin",
  "CONSENTIUM": "Consentium",
-  "CONT": "Contentos",
  "CONUN": "CONUN",
  "CONV": "Convergence",
  "COOK": "Cook",
@ -1683,17 +1702,19 @@
  "COPS": "Cops Finance",
  "COR": "Corion",
  "CORAL": "CoralPay",
-  "CORE": "Coreum",
+  "CORE": "Core",
  "COREDAO": "coreDAO",
  "COREG": "Core Group Asset",
+  "COREUM": "Coreum",
  "CORGI": "Corgi Inu",
  "CORN": "CORN",
  "CORX": "CorionX",
-  "COS": "COS",
+  "COS": "Contentos",
  "COSHI": "CoShi Inu",
  "COSM": "CosmoChain",
  "COSMIC": "CosmicSwap",
  "COSP": "Cosplay Token",
+  "COSS": "COS",
  "COSX": "Cosmecoin",
  "COT": "CoTrader",
  "COTI": "COTI",
@ -1729,7 +1750,7 @@
  "CPOOL": "Clearpool",
  "CPROP": "CPROP",
  "CPRX": "Crypto Perx",
-  "CPS": "CapriCoin",
+  "CPS": "Cryptostone",
  "CPT": "Cryptaur",
  "CPU": "CPUcoin",
  "CPX": "Apex Token",
@ -1796,6 +1817,7 @@
  "CRTS": "Cratos",
  "CRU": "Crust Network",
  "CRV": "Curve DAO Token",
+  "CRVUSD": "crvUSD",
  "CRW": "Crown Coin",
  "CRWD": "CRWD Network",
  "CRWNY": "Crowny Token",
@ -1843,7 +1865,7 @@
  "CTLX": "Cash Telex",
  "CTN": "Continuum Finance",
  "CTO": "Crypto",
-  "CTP": "Captain Planet",
+  "CTP": "Ctomorrow Platform",
  "CTPL": "Cultiplan",
  "CTPT": "Contents Protocol",
  "CTR": "Creator Platform",
@ -2007,6 +2029,7 @@
  "DBC": "DeepBrain Chain",
  "DBCCOIN": "Datablockchain",
  "DBD": "Day By Day",
+  "DBEAR": "DBear Coin",
  "DBET": "Decent.bet",
  "DBIC": "DubaiCoin",
  "DBIX": "DubaiCoin",
@ -2058,6 +2081,7 @@
  "DEEP": "DeepCloud AI",
  "DEEPG": "Deep Gold",
  "DEEX": "DEEX",
+  "DEEZ": "DEEZ NUTS",
  "DEFI": "Defi",
  "DEFI5": "DEFI Top 5 Tokens Index",
  "DEFIL": "DeFIL",
@ -2162,11 +2186,12 @@
  "DIEM": "Facebook Diem",
  "DIESEL": "Diesel",
  "DIFX": "Digital Financial Exchange",
-  "DIG": "Dignity",
+  "DIG": "DIEGO",
  "DIGG": "DIGG",
  "DIGIC": "DigiCube",
  "DIGIF": "DigiFel",
  "DIGITAL": "Digital Reserve Currency",
+  "DIGNITY": "Dignity",
  "DIGS": "Diggits",
  "DIKO": "Arkadiko",
  "DILI": "D Community",
@ -2246,6 +2271,7 @@
  "DOGBOSS": "Dog Boss",
  "DOGDEFI": "DogDeFiCoin",
  "DOGE": "Dogecoin",
+  "DOGE20": "Doge 2.0",
  "DOGEBNB": "DogeBNB",
  "DOGEC": "DogeCash",
  "DOGECEO": "Doge CEO",
@ -2539,7 +2565,7 @@
  "ELONGT": "Elon GOAT",
  "ELONONE": "AstroElon",
  "ELP": "Ellerium",
-  "ELS": "Elysium",
+  "ELS": "Ethlas",
  "ELT": "Element Black",
  "ELTC2": "eLTC",
  "ELTCOIN": "ELTCOIN",
@ -2548,6 +2574,7 @@
  "ELVN": "11Minutes",
  "ELX": "Energy Ledger",
  "ELY": "Elysian",
+  "ELYSIUM": "Elysium",
  "EM": "Eminer",
  "EMANATE": "EMANATE",
  "EMAR": "EmaratCoin",
@ -2559,6 +2586,7 @@
  "EMC2": "Einsteinium",
  "EMD": "Emerald",
  "EMIGR": "EmiratesGoldCoin",
+  "EML": "EML Protocol",
  "EMN.CUR": "Eastman Chemical",
  "EMON": "Ethermon",
  "EMOT": "Sentigraph.io",
@ -2692,6 +2720,7 @@
  "ETHD": "Ethereum Dark",
  "ETHER": "Etherparty",
  "ETHERDELTA": "EtherDelta",
+  "ETHERKING": "Ether Kingdoms Token",
  "ETHERNITY": "Ethernity Chain",
  "ETHF": "EthereumFair",
  "ETHIX": "EthicHub",
@ -2709,6 +2738,7 @@
  "ETHSHIB": "Eth Shiba",
  "ETHV": "Ethverse",
  "ETHW": "Ethereum PoW",
+  "ETHX": "Stader ETHx",
  "ETHY": "Ethereum Yield",
  "ETI": "EtherInc",
  "ETK": "Energi Token",
@ -2722,7 +2752,7 @@
  "ETR": "Electric Token",
  "ETRNT": "Eternal Trusts",
  "ETS": "ETH Share",
-  "ETSC": "Ether star blockchain",
+  "ETSC": "Ether star blockchain",
  "ETT": "EncryptoTel",
  "ETY": "Ethereum Cloud",
  "ETZ": "EtherZero",
@ -2773,6 +2803,7 @@
  "EXB": "ExaByte (EXB)",
  "EXC": "Eximchain",
  "EXCC": "ExchangeCoin",
+  "EXCHANGEN": "ExchangeN",
  "EXCL": "Exclusive Coin",
  "EXE": "ExeCoin",
  "EXFI": "Flare Finance",
@ -2781,7 +2812,7 @@
  "EXLT": "ExtraLovers",
  "EXM": "EXMO Coin",
  "EXMR": "EXMR FDN",
-  "EXN": "ExchangeN",
+  "EXN": "Exeno",
  "EXO": "Exosis",
  "EXP": "Expanse",
  "EXRD": "Radix",
@ -2814,6 +2845,7 @@
  "FAIR": "FairCoin",
  "FAIRC": "Faireum Token",
  "FAIRG": "FairGame",
+  "FAKE": "FAKE COIN",
  "FAKT": "Medifakt",
  "FALCONS": "Falcon Swaps",
  "FAME": "Fame MMA",
@ -2860,6 +2892,7 @@
  "FDO": "Firdaos",
  "FDR": "French Digital Reserve",
  "FDT": "Frutti Dino",
+  "FDUSD": "First Digital USD",
  "FDX": "fidentiaX",
  "FDZ": "Friendz",
  "FEAR": "Fear",
@ -2870,6 +2903,7 @@
  "FEN": "First Ever NFT",
  "FENOMY": "Fenomy",
  "FER": "Ferro",
+  "FERC": "FairERC20",
  "FERMA": "Ferma",
  "FESS": "Fesschain",
  "FET": "Fetch.AI",
@ -2931,7 +2965,7 @@
  "FLASH": "Flashstake",
  "FLASHC": "FLASH coin",
  "FLC": "FlowChainCoin",
-  "FLD": "FLUID",
+  "FLD": "FluidAI",
  "FLDC": "Folding Coin",
  "FLDT": "FairyLand",
  "FLETA": "FLETA",
@ -3091,6 +3125,7 @@
  "FUEL": "Jetfuel Finance",
  "FUJIN": "Fujinto",
  "FUKU": "Furukuru",
+  "FUMO": "Alien Milady Fumo",
  "FUN": "FUN Token",
  "FUNC": "FunCoin",
  "FUND": "Unification",
@ -3101,6 +3136,7 @@
  "FUNDZ": "FundFantasy",
  "FUNK": "Cypherfunks Coin",
  "FUR": "Furio",
+  "FURU": "Furucombo",
  "FURY": "Engines of Fury",
  "FUS": "Fus",
  "FUSE": "Fuse Network Token",
@ -3118,6 +3154,7 @@
  "FXP": "FXPay",
  "FXS": "Frax Share",
  "FXT": "FuzeX",
+  "FXY": "Floxypay",
  "FYN": "Affyn",
  "FYP": "FlypMe",
  "FYZ": "Fyooz",
@ -3172,6 +3209,7 @@
  "GAT": "GATCOIN",
  "GATE": "GATENet",
  "GATEWAY": "Gateway Protocol",
+  "GAYPEPE": "Gay Pepe",
  "GAZE": "GazeTV",
  "GB": "GoldBlocks",
  "GBA": "Geeba",
@ -3222,6 +3260,7 @@
  "GEMZ": "Gemz Social",
  "GEN": "DAOstack",
  "GENE": "Genopets",
+  "GENIE": "The Genie",
  "GENIX": "Genix",
  "GENS": "Genshiro",
  "GENSTAKE": "Genstake",
@ -3261,6 +3300,7 @@
  "GHCOLD": "Galaxy Heroes Coin",
  "GHD": "Giftedhands",
  "GHNY": "Grizzly Honey",
+  "GHO": "GHO",
  "GHOST": "GhostbyMcAfee",
  "GHOSTCOIN": "GhostCoin",
  "GHOSTM": "GhostMarket",
@ -3274,6 +3314,7 @@
  "GIFT": "GiftNet",
  "GIG": "GigaCoin",
  "GIGA": "GigaSwap",
+  "GIGX": "GigXCoin",
  "GIM": "Gimli",
  "GIMMER": "Gimmer",
  "GIN": "GINcoin",
@ -3385,6 +3426,7 @@
  "GOVT": "The Government Network",
  "GOZ": "Göztepe S.K. Fan Token",
  "GP": "Wizards And Dragons",
+  "GPBP": "Genius Playboy Billionaire Philanthropist",
  "GPKR": "Gold Poker",
  "GPL": "Gold Pressed Latinum",
  "GPPT": "Pluto Project Coin",
@ -3501,7 +3543,8 @@
  "HALF": "0.5X Long Bitcoin Token",
  "HALFSHIT": "0.5X Long Shitcoin Index Token",
  "HALLO": "Halloween Coin",
-  "HALO": "Halo Platform",
+  "HALO": "Halo Coin",
+  "HALOPLATFORM": "Halo Platform",
  "HAM": "Hamster",
  "HAMS": "HamsterCoin",
  "HANA": "Hanacoin",
@ -3598,6 +3641,7 @@
  "HILL": "President Clinton",
  "HINA": "Hina Inu",
  "HINT": "Hintchain",
+  "HIPPO": "HIPPO",
  "HIRE": "HireMatch",
  "HIT": "HitChain",
  "HITBTC": "HitBTC Token",
@ -3634,6 +3678,7 @@
  "HNTR": "Hunter",
  "HNY": "Honey",
  "HNZO": "Hanzo Inu",
+  "HOBO": "HOBO THE BEAR",
  "HOD": "HoDooi.com",
  "HODL": "HOdlcoin",
  "HOGE": "Hoge Finance",
@ -3839,7 +3884,7 @@
  "IMPCN": "Brain Space",
  "IMPER": "Impermax",
  "IMPS": "Impulse Coin",
-  "IMPT": "Ether Kingdoms Token",
+  "IMPT": "IMPT",
  "IMPULSE": "IMPULSE by FDR",
  "IMS": "Independent Money System",
  "IMST": "Imsmart",
@ -4001,6 +4046,7 @@
  "JAM": "Tune.Fm",
  "JANE": "JaneCoin",
  "JAR": "Jarvis+",
+  "JARED": "Jared From Subway",
  "JASMY": "JasmyCoin",
  "JBS": "JumBucks Coin",
  "JBX": "Juicebox",
@ -4163,9 +4209,10 @@
  "KIN": "Kin",
  "KIND": "Kind Ads",
  "KINE": "Kine Protocol",
-  "KING": "King Finance",
+  "KING": "KING",
  "KING93": "King93",
  "KINGDOMQUEST": "Kingdom Quest",
+  "KINGF": "King Finance",
  "KINGSHIB": "King Shiba",
  "KINGSWAP": "KingSwap",
  "KINT": "Kintsugi",
@ -4175,6 +4222,7 @@
  "KISC": "Kaiser",
  "KISHIMOTO": "Kishimoto Inu",
  "KISHU": "Kishu Inu",
+  "KITA": "KITA INU",
  "KITSU": "Kitsune Inu",
  "KITTY": "Kitty Inu",
  "KKO": "Kineko",
@ -4267,10 +4315,12 @@
  "KUBO": "KUBO",
  "KUBOS": "KubosCoin",
  "KUE": "Kuende",
+  "KUJI": "Kujira",
  "KUMA": "Kuma Inu",
  "KUNCI": "Kunci Coin",
  "KUR": "Kuro",
  "KURT": "Kurrent",
+  "KUSA": "Kusa Inu",
  "KUSD": "Kowala",
  "KUSH": "KushCoin",
  "KUV": "Kuverit",
@ -4280,6 +4330,7 @@
  "KVT": "Kinesis Velocity Token",
  "KWATT": "4New",
  "KWD": "KIWI DEFI",
+  "KWENTA": "Kwenta",
  "KWH": "KWHCoin",
  "KWIK": "KwikSwap",
  "KWS": "Knight War Spirits",
@ -4299,7 +4350,9 @@
  "LABX": "Stakinglab",
  "LACCOIN": "LocalAgro",
  "LACE": "Lovelace World",
+  "LADYS": "Milady Meme Coin",
  "LAEEB": "LaEeb",
+  "LAELAPS": "Laelaps",
  "LAIKA": "Laika Protocol",
  "LALA": "LaLa World",
  "LAMB": "Lambda",
@ -4455,13 +4508,14 @@
  "LLAND": "Lyfe Land",
  "LLG": "Loligo",
  "LLION": "Lydian Lion",
-  "LM": "LM Token",
+  "LM": "LeisureMeta",
  "LMAO": "LMAO Finance",
  "LMC": "LomoCoin",
  "LMCH": "Latamcash",
  "LMCSWAP": "LimoCoin SWAP",
  "LMR": "Lumerin",
  "LMT": "Lympo Market Token",
+  "LMTOKEN": "LM Token",
  "LMXC": "LimonX",
  "LMY": "Lunch Money",
  "LN": "LINK",
@ -4530,6 +4584,7 @@
  "LRG": "Largo Coin",
  "LRN": "Loopring [NEO]",
  "LSD": "LightSpeedCoin",
+  "LSETH": "Liquid Staked ETH",
  "LSK": "Lisk",
  "LSP": "Lumenswap",
  "LSS": "Lossless",
@ -4626,6 +4681,7 @@
  "MAEP": "Maester Protocol",
  "MAG": "Magnet",
  "MAGIC": "Magic",
+  "MAGICF": "MagicFox",
  "MAHA": "MahaDAO",
  "MAI": "Mindsync",
  "MAID": "MaidSafe Coin",
@ -4639,6 +4695,7 @@
  "MANDOX": "MandoX",
  "MANGA": "Manga Token",
  "MANNA": "Manna",
+  "MANTLE": "Mantle",
  "MAP": "MAP Protocol",
  "MAPC": "MapCoin",
  "MAPE": "Mecha Morphing",
@ -4672,6 +4729,7 @@
  "MATIC": "Polygon",
  "MATPAD": "MaticPad",
  "MATTER": "AntiMatter",
+  "MAV": "Maverick Protocol",
  "MAX": "MaxCoin",
  "MAXR": "Max Revive",
  "MAY": "Theresa May Coin",
@ -4776,6 +4834,7 @@
  "MESA": "MetaVisa",
  "MESG": "MESG",
  "MESH": "MeshBox",
+  "MESSI": "MESSI COIN",
  "MET": "Metronome",
  "META": "Metadium",
  "METAC": "Metacoin",
@ -4881,6 +4940,7 @@
  "MIODIO": "MIODIOCOIN",
  "MIOTA": "IOTA",
  "MIR": "Mirror Protocol",
+  "MIRACLE": "MIRACLE",
  "MIRC": "MIR COIN",
  "MIS": "Mithril Share",
  "MISA": "Sangkara",
@ -4938,7 +4998,6 @@
  "MNRB": "MoneyRebel",
  "MNS": "Monnos",
  "MNST": "MoonStarter",
-  "MNT": "microNFT",
  "MNTC": "Manet Coin",
  "MNTG": "Monetas",
  "MNTL": "AssetMantle",
@ -4967,6 +5026,7 @@
  "MOF": "Molecular Future (TRC20)",
  "MOFI": "MobiFi",
  "MOFOLD": "Molecular Future (ERC20)",
+  "MOG": "Mog Coin",
  "MOGU": "Mogu",
  "MOGX": "Mogu",
  "MOI": "MyOwnItem",
@ -4989,9 +5049,11 @@
  "MONEYIMT": "MoneyToken",
  "MONF": "Monfter",
  "MONG": "MongCoin",
+  "MONG20": "Mongoose 2.0",
  "MONI": "Monsta Infinite",
  "MONK": "Monkey Project",
  "MONKEY": "Monkey",
+  "MONKEYS": "Monkeys Token",
  "MONO": "MonoX",
  "MONONOKEINU": "Mononoke Inu",
  "MONS": "Monsters Clan",
@ -5011,11 +5073,13 @@
  "MOONSHOT": "Moonshot",
  "MOOO": "Hashtagger",
  "MOOV": "dotmoovs",
+  "MOOX": "Moox Protocol",
  "MOPS": "Mops",
  "MORA": "Meliora",
  "MORE": "More Coin",
  "MOS": "MOS Coin",
  "MOT": "Olympus Labs",
+  "MOTG": "MetaOctagon",
  "MOTI": "Motion",
  "MOTO": "Motocoin",
  "MOV": "MovieCoin",
@ -5076,6 +5140,7 @@
  "MSWAP": "MoneySwap",
  "MT": "MyToken",
  "MTA": "Meta",
+  "MTB": "MetaBridge",
  "MTBC": "Metabolic",
  "MTC": "MEDICAL TOKEN CURRENCY",
  "MTCMN": "MTC Mesh",
@ -5108,6 +5173,7 @@
  "MUE": "MonetaryUnit",
  "MULTI": "Multichain",
  "MULTIBOT": "Multibot",
+  "MULTIV": "Multiverse",
  "MUN": "MUNcoin",
  "MUNCH": "Munch Token",
  "MUSD": "mStable USD",
@ -5648,6 +5714,7 @@
  "OZP": "OZAPHYRE",
  "P202": "Project 202",
  "P2PS": "P2P Solutions Foundation",
+  "PAAL": "PAAL AI",
  "PAC": "PAC Protocol",
  "PACOCA": "Pacoca",
  "PAD": "NearPad",
@ -5736,6 +5803,7 @@
  "PEARL": "Pearl Finance",
  "PEC": "PeaceCoin",
  "PEEL": "Meta Apes",
+  "PEEPA": "Peepa",
  "PEEPS": "The People’s Coin",
  "PEG": "PegNet",
  "PEGS": "PegShares",
@ -5748,6 +5816,7 @@
  "PEOPLE": "ConstitutionDAO",
  "PEOS": "pEOS",
  "PEPE": "Pepe",
+  "PEPE20": "Pepe 2.0",
  "PEPECASH": "Pepe Cash",
  "PEPPER": "Pepper Token",
  "PEPS": "PEPS Coin",
@ -5822,6 +5891,7 @@
  "PINK": "PinkCoin",
  "PINKX": "PantherCoin",
  "PINMO": "Pinmo",
+  "PINO": "Pinocchu",
  "PINU": "Piccolo Inu",
  "PIO": "Pioneershares",
  "PIPI": "Pippi Finance",
@ -5885,6 +5955,7 @@
  "PLS": "Pulsechain",
  "PLSD": "PulseDogecoin",
  "PLSPAD": "PulsePad",
+  "PLSX": "PulseX",
  "PLT": "Poollotto.finance",
  "PLTC": "PlatonCoin",
  "PLTX": "PlutusX",
@ -5911,7 +5982,6 @@
  "PNK": "Kleros",
  "PNL": "True PNL",
  "PNODE": "Pinknode",
-  "PNP": "LogisticsX",
  "PNT": "pNetwork Token",
  "PNX": "PhantomX",
  "PNY": "Peony Coin",
@ -5927,6 +5997,7 @@
  "POINTS": "Cryptsy Points",
  "POK": "Pokmonsters",
  "POKEM": "Pokemonio",
+  "POKEMON": "Pokemon",
  "POKER": "PokerCoin",
  "POKT": "Pocket Network",
  "POL": "Pool-X",
@ -6010,6 +6081,7 @@
  "PRIME": "Echelon Prime",
  "PRIMECHAIN": "PrimeChain",
  "PRINT": "Printer.Finance",
+  "PRINTERIUM": "Printerium",
  "PRINTS": "FingerprintsDAO",
  "PRISM": "Prism",
  "PRIX": "Privatix",
@ -6033,7 +6105,7 @@
  "PROTON": "Proton",
  "PROUD": "PROUD Money",
  "PROXI": "PROXI",
-  "PRP": "Papyrus",
+  "PRP": "Pepe Prime",
  "PRPS": "Purpose",
  "PRPT": "Purple Token",
  "PRQ": "PARSIQ",
@ -6042,7 +6114,7 @@
  "PRTG": "Pre-Retogeum",
  "PRV": "PrivacySwap",
  "PRVS": "Previse",
-  "PRX": "Printerium",
+  "PRX": "Parex",
  "PRXY": "Proxy",
  "PRY": "PRIMARY",
  "PSB": "Planet Sandbox",
@ -6120,6 +6192,7 @@
  "PYRAM": "Pyram Token",
  "PYRK": "Pyrk",
  "PYT": "Payther",
+  "PYUSD": "PayPal USD",
  "PZM": "Prizm",
  "Q1S": "Quantum1Net",
  "Q2C": "QubitCoin",
@ -6178,6 +6251,7 @@
  "QUA": "Quantum Tech",
  "QUACK": "Rich Quack",
  "QUAM": "Quam Network",
+  "QUANT": "Quant Finance",
  "QUARASHI": "Quarashi Network",
  "QUARTZ": "Sandclock",
  "QUASA": "Quasacoin",
@ -6201,7 +6275,7 @@
  "RAC": "RAcoin",
  "RACA": "Radio Caca",
  "RACEFI": "RaceFi",
-  "RAD": "Radicle",
+  "RAD": "Radworks",
  "RADAR": "DappRadar",
  "RADI": "RadicalCoin",
  "RADIO": "RadioShack",
@ -6220,7 +6294,7 @@
  "RAM": "Ramifi Protocol",
  "RAMP": "RAMP",
  "RANKER": "RankerDao",
-  "RAP": "Rapture",
+  "RAP": "Philosoraptor",
  "RAPDOGE": "RapDoge",
  "RARE": "SuperRare",
  "RARI": "Rarible",
@ -6277,6 +6351,7 @@
  "REA": "Realisto",
  "REAL": "RealLink",
  "REALM": "Realm",
+  "REALMS": "Realms of Ethernity",
  "REALPLATFORM": "REAL",
  "REALY": "Realy Metaverse",
  "REAP": "ReapChain",
@ -6287,6 +6362,7 @@
  "RED": "RED TOKEN",
  "REDC": "RedCab",
  "REDCO": "Redcoin",
+  "REDDIT": "Reddit",
  "REDI": "REDi",
  "REDLANG": "RED",
  "REDLC": "Redlight Chain",
@ -6324,7 +6400,7 @@
  "REST": "Restore",
  "RET": "RealTract",
  "RETAIL": "Retail.Global",
-  "RETH": "Realms of Ethernity",
+  "RETH": "Rocket Pool ETH",
  "RETH2": "rETH2",
  "RETIRE": "Retire Token",
  "REU": "REUCOIN",
@ -6351,6 +6427,7 @@
  "RGP": "Rigel Protocol",
  "RGT": "Rari Governance Token",
  "RHEA": "Rhea",
+  "RHINO": "RHINO",
  "RHOC": "RChain",
  "RHP": "Rhypton Club",
  "RIC": "Riecoin",
@ -6490,6 +6567,7 @@
  "RWE": "Real-World Evidence",
  "RWN": "Rowan Token",
  "RWS": "Robonomics Web Services",
+  "RXD": "Radiant",
  "RXT": "RIMAUNANGIS",
  "RYC": "RoyalCoin",
  "RYCN": "RoyalCoin 2.0",
@ -6564,6 +6642,7 @@
  "SBTC": "Super Bitcoin",
  "SC": "Siacoin",
  "SCA": "SiaClassic",
+  "SCAM": "Scam Coin",
  "SCAP": "SafeCapital",
  "SCAR": "Velhalla",
  "SCASH": "SpaceCash",
@ -6624,6 +6703,7 @@
  "SEER": "SEER",
  "SEI": "Sei",
  "SEL": "SelenCoin",
+  "SELF": "SELFCrypto",
  "SEM": "Semux",
  "SEN": "Sentaro",
  "SENATE": "SENATE",
@ -6665,6 +6745,7 @@
  "SGE": "Society of Galactic Exploration",
  "SGLY": "Singularity",
  "SGN": "Signals Network",
+  "SGO": "SafuuGO",
  "SGOLD": "SpaceGold",
  "SGP": "SGPay",
  "SGR": "Sogur Currency",
@ -6684,6 +6765,7 @@
  "SHEESH": "Sheesh it is bussin bussin",
  "SHEESHA": "Sheesha Finance",
  "SHELL": "Shell Token",
+  "SHERA": "Shera Tokens",
  "SHFL": "SHUFFLE!",
  "SHFT": "Shyft Network",
  "SHI": "Shirtum",
@ -6719,6 +6801,8 @@
  "SHR": "ShareToken",
  "SHREK": "ShrekCoin",
  "SHROOM": "Shroom.Finance",
+  "SHROOMFOX": "Magic Shroom",
+  "SHS": "SHEESH",
  "SHX": "Stronghold Token",
  "SI": "Siren",
  "SIB": "SibCoin",
@ -7018,9 +7102,11 @@
  "STEN": "Steneum Coin",
  "STEP": "Step Finance",
  "STEPH": "Step Hero",
+  "STEPR": "Step",
  "STEPS": "Steps",
  "STERLINGCOIN": "SterlingCoin",
  "STETH": "Staked Ether",
+  "STEWIE": "Stewie Coin",
  "STEX": "STEX",
  "STF": "Structure Finance",
  "STFX": "STFX",
@ -7055,7 +7141,7 @@
  "STR": "Sourceless",
  "STRAKS": "Straks",
  "STRAX": "Stratis",
-  "STRAY": "Animal Token",
+  "STRAY": "Stray Dog",
  "STREAM": "STREAMIT COIN",
  "STRIP": "Stripto",
  "STRK": "Strike",
@ -7361,6 +7447,7 @@
  "TOM": "TOM Finance",
  "TOMAHAWKCOIN": "Tomahawkcoin",
  "TOMB": "Tomb",
+  "TOMI": "tomiNet",
  "TOMO": "TomoChain",
  "TOMOE": "TomoChain ERC20",
  "TOMS": "TomTomCoin",
@ -7385,6 +7472,7 @@
  "TOTM": "Totem",
  "TOWER": "Tower",
  "TOWN": "Town Star",
+  "TOX": "INTOverse",
  "TOZ": "Tozex",
  "TP": "Token Swap",
  "TPAD": "TrustPad",
@ -7600,6 +7688,7 @@
  "UNITY": "SuperNET",
  "UNIVRS": "Universe",
  "UNIX": "UniX",
+  "UNLEASH": "UnleashClub",
  "UNN": "UNION Protocol Governance Token",
  "UNO": "Unobtanium",
  "UNORE": "UnoRe",
@ -7673,6 +7762,7 @@
  "UTT": "United Traders Token",
  "UTU": "UTU Protocol",
  "UUU": "U Network",
+  "UWU": "uwu",
  "UZUMAKI": "Uzumaki Inu",
  "VAB": "Vabble",
  "VADER": "Vader Protocol",
@ -7695,6 +7785,7 @@
  "VCF": "Valencia CF Fan Token",
  "VCG": "VCGamers",
  "VCK": "28VCK",
+  "VCORE": "VCORE",
  "VDG": "VeriDocGlobal",
  "VDL": "Vidulum",
  "VDO": "VidioCoin",
@ -7710,6 +7801,7 @@
  "VEIL": "VEIL",
  "VELA": "Vela Token",
  "VELO": "Velo",
+  "VELOD": "Velodrome Finance",
  "VELOX": "Velox",
  "VELOXPROJECT": "Velox",
  "VEMP": "vEmpire DDAO",
@ -7782,6 +7874,7 @@
  "VNT": "VNT Chain",
  "VNTW": "Value Network Token",
  "VNX": "VisionX",
+  "VNXAU": "VNX Gold",
  "VNXLU": "VNX Exchange",
  "VOCO": "Provoco",
  "VODKA": "Vodka Token",
@ -7902,7 +7995,8 @@
  "WEC": "Whole Earth Coin",
  "WEGEN": "WeGen Platform",
  "WELD": "Weld",
-  "WELL": "Well",
+  "WELL": "Moonwell",
+  "WELLTOKEN": "Well",
  "WELT": "Fabwelt",
  "WELUPS": "Welups Blockchain",
  "WEMIX": "WEMIX",
@ -7958,6 +8052,7 @@
  "WIX": "Wixlar",
  "WIZ": "WIZ Protocol",
  "WKD": "Wakanda Inu",
+  "WLD": "Worldcoin",
  "WLF": "Wolfs Group",
  "WLITI": "wLITI",
  "WLK": "Wolk",
@ -7983,6 +8078,7 @@
  "WNZ": "Winerz",
  "WOA": "Wrapped Origin Axie",
  "WOD": "World of Defish",
+  "WOID": "WORLD ID",
  "WOJ": "Wojak Finance",
  "WOLF": "Insanity Coin",
  "WOLFILAND": "Wolfiland",
@ -8000,6 +8096,7 @@
  "WOOFY": "Woofy",
  "WOOL": "Wolf Game Wool",
  "WOONK": "Woonkly",
+  "WOOO": "wooonen",
  "WOOP": "Woonkly Power",
  "WOP": "WorldPay",
  "WORLD": "World Token",
@ -8010,6 +8107,7 @@
  "WOZX": "Efforce",
  "WPC": "WePiggy Coin",
  "WPE": "OPES (Wrapped PE)",
+  "WPLS": "Wrapped Pulse",
  "WPP": "Green Energy Token",
  "WPR": "WePower",
  "WQT": "Work Quest",
@ -8049,6 +8147,7 @@
  "WZEC": "Wrapped Zcash",
  "WZENIQ": "Wrapped Zeniq (ETH)",
  "WZRD": "Wizardia",
+  "X": "AI-X",
  "X2": "X2Coin",
  "X2Y2": "X2Y2",
  "X42": "X42 Protocol",
@ -8096,7 +8195,7 @@
  "XCI": "Cannabis Industry Coin",
  "XCLR": "ClearCoin",
  "XCM": "CoinMetro",
-  "XCN": "Chain",
+  "XCN": "Onyxcoin",
  "XCO": "XCoin",
  "XCONSOL": "X-Consoles",
  "XCP": "CounterParty",
@ -8365,6 +8464,7 @@
  "YUANG": "Yuang Coin",
  "YUCJ": "Yu Coin",
  "YUCT": "Yucreat",
+  "YUDI": "Yudi",
  "YUM": "Yumerium",
  "YUMMY": "Yummy",
  "YUP": "Crowdholding",
--- a/apps/api/src/assets/cryptocurrencies/custom.json
+++ b/apps/api/src/assets/cryptocurrencies/custom.json
@ -1,4 +1,5 @@
 {
+  "CYBER24781": "CyberConnect",
  "LUNA1": "Terra",
  "LUNA2": "Terra",
  "SGB1": "Songbird",
--- a/apps/api/src/assets/sitemap.xml
+++ b/apps/api/src/assets/sitemap.xml
@ -0,0 +1,943 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+  xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+    http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+  <url>
+    <loc>https://ghostfol.io/de</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog/2021/07/hallo-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/features</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/haeufig-gestellte-fragen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/maerkte</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/preise</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/registrierung</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-altoo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-capmon</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-copilot-money</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-delta</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-divvydiary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-exirio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-finary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-folishare</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-getquin</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-gospatz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-justetf</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-kubera</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-markets.sh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-maybe-finance</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-monse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-parqet</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-plannix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-portfolio-dividend-tracker</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-portseido</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-projectionlab</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-seeking-alpha</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-sharesight</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-simple-portfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-snowball-analytics</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-stockle</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-stockmarketeye</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-sumio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-utluna</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen/personal-finance-tools/open-source-alternative-zu-yeekatee</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/datenschutzbestimmungen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/lizenz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about/license</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2021/07/hello-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/01/ghostfolio-first-months-in-open-source</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/07/ghostfolio-meets-internet-identity</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/07/how-do-i-get-my-finances-in-order</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/08/500-stars-on-github</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/10/hacktoberfest-2022</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/11/black-friday-2022</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/12/the-importance-of-tracking-your-personal-finances</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/02/ghostfolio-meets-umbrel</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/03/ghostfolio-reaches-1000-stars-on-github</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/05/unlock-your-financial-potential-with-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/07/exploring-the-path-to-fire</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/08/ghostfolio-joins-oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/09/ghostfolio-2</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/09/hacktoberfest-2023</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/faq</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/features</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/markets</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/pricing</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/register</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-altoo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-capmon</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-copilot-money</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-delta</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-divvydiary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-exirio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-finary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-folishare</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-getquin</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-gospatz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-justetf</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-kubera</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-markets.sh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-maybe-finance</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-monse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-parqet</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-plannix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-portfolio-dividend-tracker</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-portseido</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-projectionlab</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-seeking-alpha</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-sharesight</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-simple-portfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-snowball-analytics</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-stockle</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-stockmarketeye</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-sumio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-utluna</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-yeekatee</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/funcionalidades</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/mercados</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/precios</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/preguntas-mas-frecuentes</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/recursos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/registro</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/licencia</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/politica-de-privacidad</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/licence</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/politique-de-confidentialite</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/enregistrement</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/fonctionnalites</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/foire-aux-questions</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/marches</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/prix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/ressources</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/domande-piu-frequenti</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/funzionalita</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/informativa-sulla-privacy</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/licenza</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/iscrizione</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/mercati</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/prezzi</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-altoo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-campmon</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-copilot-money</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-delta</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-divvydiary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-exirio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-finary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-folishare</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-getquin</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-gospatz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-justetf</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-kubera</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-markets.sh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-maybe-finance</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-monse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-parqet</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-plannix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-portfolio-dividend-tracker</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-portseido</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-projectionlab</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-seeking-alpha</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-sharesight</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-simple-portfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-snowball-analytics</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-stockle</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-stockmarketeye</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-sumio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-utluna</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse/personal-finance-tools/alternativa-open-source-a-yeekatee</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-altoo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-capmon</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-copilot-money</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-delta</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-divvydiary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-exirio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-finary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-folishare</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-getquin</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-gospatz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-justetf</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-kubera</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-markets.sh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-maybe-finance</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-monse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-parqet</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-plannix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-portfolio-dividend-tracker</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-portseido</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-projectionlab</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-seeking-alpha</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-sharesight</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-simple-portfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-snowball-analytics</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-stockle</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-stockmarketeye</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-sumio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-utluna</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen/personal-finance-tools/open-source-alternatief-voor-yeekatee</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/functionaliteiten</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/markten</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/licentie</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/privacybeleid</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/prijzen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/registratie</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/veelgestelde-vragen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/funcionalidades</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/mercados</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/open</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/perguntas-mais-frequentes</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/precos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/recursos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/registo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/licenca</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/oss-friends</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/politica-de-privacidade</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/tr</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+</urlset>
--- a/apps/api/src/helper/object.helper.ts
+++ b/apps/api/src/helper/object.helper.ts
@ -3,7 +3,7 @@ import { cloneDeep, isArray, isObject } from 'lodash';

 export function hasNotDefinedValuesInObject(aObject: Object): boolean {
  for (const key in aObject) {
-    if (aObject[key] === null || aObject[key] === null) {
+    if (aObject[key] === null || aObject[key] === undefined) {
      return true;
    } else if (isObject(aObject[key])) {
      return hasNotDefinedValuesInObject(aObject[key]);
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@ -7,6 +7,7 @@ import helmet from 'helmet';

 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+import { HtmlTemplateMiddleware } from './middlewares/html-template.middleware';

 async function bootstrap() {
  const configApp = await NestFactory.create(AppModule);
@ -23,7 +24,7 @@ async function bootstrap() {
    defaultVersion: '1',
    type: VersioningType.URI
  });
-  app.setGlobalPrefix('api');
+  app.setGlobalPrefix('api', { exclude: ['sitemap.xml'] });
  app.useGlobalPipes(
    new ValidationPipe({
      forbidNonWhitelisted: true,
@ -40,6 +41,7 @@ async function bootstrap() {
      helmet({
        contentSecurityPolicy: {
          directives: {
+            connectSrc: ["'self'", 'https://js.stripe.com'], // Allow connections to Stripe
            frameSrc: ["'self'", 'https://js.stripe.com'], // Allow loading frames from Stripe
            scriptSrc: ["'self'", "'unsafe-inline'", 'https://js.stripe.com'], // Allow inline scripts and scripts from Stripe
            scriptSrcAttr: ["'self'", "'unsafe-inline'"], // Allow inline event handlers
@ -51,7 +53,8 @@ async function bootstrap() {
    );
  }

-  const BASE_CURRENCY = configService.get<string>('BASE_CURRENCY');
+  app.use(HtmlTemplateMiddleware);
+
  const HOST = configService.get<string>('HOST') || '0.0.0.0';
  const PORT = configService.get<number>('PORT') || 3333;

@ -59,15 +62,6 @@ async function bootstrap() {
    logLogo();
    Logger.log(`Listening at http://${HOST}:${PORT}`);
    Logger.log('');
-
-    if (BASE_CURRENCY) {
-      Logger.warn(
-        `The environment variable "BASE_CURRENCY" is deprecated and will be removed in Ghostfolio 2.0.`
-      );
-      Logger.warn(
-        'Please use the currency converter in the activity dialog instead.'
-      );
-    }
  });
 }

--- a/apps/api/src/middlewares/html-template.middleware.ts
+++ b/apps/api/src/middlewares/html-template.middleware.ts
@ -0,0 +1,136 @@
+import * as fs from 'fs';
+import { join } from 'path';
+
+import { environment } from '@ghostfolio/api/environments/environment';
+import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';
+import {
+  DEFAULT_LANGUAGE_CODE,
+  DEFAULT_ROOT_URL,
+  SUPPORTED_LANGUAGE_CODES
+} from '@ghostfolio/common/config';
+import { DATE_FORMAT, interpolate } from '@ghostfolio/common/helper';
+import { format } from 'date-fns';
+import { NextFunction, Request, Response } from 'express';
+
+const title = 'Ghostfolio – Open Source Wealth Management Software';
+const titleShort = 'Ghostfolio';
+
+const i18nService = new I18nService();
+
+let indexHtmlMap: { [languageCode: string]: string } = {};
+
+try {
+  indexHtmlMap = SUPPORTED_LANGUAGE_CODES.reduce(
+    (map, languageCode) => ({
+      ...map,
+      [languageCode]: fs.readFileSync(
+        join(__dirname, '..', 'client', languageCode, 'index.html'),
+        'utf8'
+      )
+    }),
+    {}
+  );
+} catch {}
+
+const locales = {
+  '/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt': {
+    featureGraphicPath: 'assets/images/blog/ghostfolio-x-sackgeld.png',
+    title: `Ghostfolio auf Sackgeld.com vorgestellt - ${titleShort}`
+  },
+  '/en/blog/2022/08/500-stars-on-github': {
+    featureGraphicPath: 'assets/images/blog/500-stars-on-github.jpg',
+    title: `500 Stars - ${titleShort}`
+  },
+  '/en/blog/2022/10/hacktoberfest-2022': {
+    featureGraphicPath: 'assets/images/blog/hacktoberfest-2022.png',
+    title: `Hacktoberfest 2022 - ${titleShort}`
+  },
+  '/en/blog/2022/12/the-importance-of-tracking-your-personal-finances': {
+    featureGraphicPath: 'assets/images/blog/20221226.jpg',
+    title: `The importance of tracking your personal finances - ${titleShort}`
+  },
+  '/en/blog/2023/02/ghostfolio-meets-umbrel': {
+    featureGraphicPath: 'assets/images/blog/ghostfolio-x-umbrel.png',
+    title: `Ghostfolio meets Umbrel - ${titleShort}`
+  },
+  '/en/blog/2023/03/ghostfolio-reaches-1000-stars-on-github': {
+    featureGraphicPath: 'assets/images/blog/1000-stars-on-github.jpg',
+    title: `Ghostfolio reaches 1’000 Stars on GitHub - ${titleShort}`
+  },
+  '/en/blog/2023/05/unlock-your-financial-potential-with-ghostfolio': {
+    featureGraphicPath: 'assets/images/blog/20230520.jpg',
+    title: `Unlock your Financial Potential with Ghostfolio - ${titleShort}`
+  },
+  '/en/blog/2023/07/exploring-the-path-to-fire': {
+    featureGraphicPath: 'assets/images/blog/20230701.jpg',
+    title: `Exploring the Path to FIRE - ${titleShort}`
+  },
+  '/en/blog/2023/08/ghostfolio-joins-oss-friends': {
+    featureGraphicPath: 'assets/images/blog/ghostfolio-joins-oss-friends.png',
+    title: `Ghostfolio joins OSS Friends - ${titleShort}`
+  },
+  '/en/blog/2023/09/ghostfolio-2': {
+    featureGraphicPath: 'assets/images/blog/ghostfolio-2.jpg',
+    title: `Announcing Ghostfolio 2.0 - ${titleShort}`
+  },
+  '/en/blog/2023/09/hacktoberfest-2023': {
+    featureGraphicPath: 'assets/images/blog/hacktoberfest-2023.png',
+    title: `Hacktoberfest 2023 - ${titleShort}`
+  }
+};
+
+const isFileRequest = (filename: string) => {
+  if (filename === '/assets/LICENSE') {
+    return true;
+  } else if (
+    filename.includes('auth/ey') ||
+    filename.includes(
+      'personal-finance-tools/open-source-alternative-to-markets.sh'
+    )
+  ) {
+    return false;
+  }
+
+  return filename.split('.').pop() !== filename;
+};
+
+export const HtmlTemplateMiddleware = async (
+  request: Request,
+  response: Response,
+  next: NextFunction
+) => {
+  const path = request.originalUrl.replace(/\/$/, '');
+  let languageCode = path.substr(1, 2);
+
+  if (!SUPPORTED_LANGUAGE_CODES.includes(languageCode)) {
+    languageCode = DEFAULT_LANGUAGE_CODE;
+  }
+
+  const currentDate = format(new Date(), DATE_FORMAT);
+  const rootUrl = process.env.ROOT_URL || DEFAULT_ROOT_URL;
+
+  if (
+    path.startsWith('/api/') ||
+    isFileRequest(path) ||
+    !environment.production
+  ) {
+    // Skip
+    next();
+  } else {
+    const indexHtml = interpolate(indexHtmlMap[languageCode], {
+      currentDate,
+      languageCode,
+      path,
+      rootUrl,
+      description: i18nService.getTranslation({
+        languageCode,
+        id: 'metaDescription'
+      }),
+      featureGraphicPath:
+        locales[path]?.featureGraphicPath ?? 'assets/cover.png',
+      title: locales[path]?.title ?? title
+    });
+
+    return response.send(indexHtml);
+  }
+};
--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
@ -1,4 +1,5 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import {
  PortfolioDetails,
@ -6,16 +7,18 @@ import {
  UserSettings
 } from '@ghostfolio/common/interfaces';

-import { Rule } from '../../rule';
-
 export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
+  private accounts: PortfolioDetails['accounts'];
+
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private accounts: PortfolioDetails['accounts']
+    accounts: PortfolioDetails['accounts']
  ) {
    super(exchangeRateDataService, {
      name: 'Investment'
    });
+
+    this.accounts = accounts;
  }

  public evaluate(ruleSettings: Settings) {
--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
@ -1,17 +1,20 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PortfolioDetails, UserSettings } from '@ghostfolio/common/interfaces';

-import { Rule } from '../../rule';
-
 export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
+  private accounts: PortfolioDetails['accounts'];
+
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private accounts: PortfolioDetails['accounts']
+    accounts: PortfolioDetails['accounts']
  ) {
    super(exchangeRateDataService, {
      name: 'Single Account'
    });
+
+    this.accounts = accounts;
  }

  public evaluate() {
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@ -1,17 +1,20 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

-import { Rule } from '../../rule';
-
 export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Settings> {
+  private positions: TimelinePosition[];
+
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private positions: TimelinePosition[]
+    positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Investment: Base Currency'
    });
+
+    this.positions = positions;
  }

  public evaluate(ruleSettings: Settings) {
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@ -1,17 +1,20 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

-import { Rule } from '../../rule';
-
 export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
+  private positions: TimelinePosition[];
+
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private positions: TimelinePosition[]
+    positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Investment'
    });
+
+    this.positions = positions;
  }

  public evaluate(ruleSettings: Settings) {
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
@ -0,0 +1,46 @@
+import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { UserSettings } from '@ghostfolio/common/interfaces';
+
+export class EmergencyFundSetup extends Rule<Settings> {
+  private emergencyFund: number;
+
+  public constructor(
+    protected exchangeRateDataService: ExchangeRateDataService,
+    emergencyFund: number
+  ) {
+    super(exchangeRateDataService, {
+      name: 'Emergency Fund: Set up'
+    });
+
+    this.emergencyFund = emergencyFund;
+  }
+
+  public evaluate(ruleSettings: Settings) {
+    if (this.emergencyFund > ruleSettings.threshold) {
+      return {
+        evaluation: 'An emergency fund has been set up',
+        value: true
+      };
+    }
+
+    return {
+      evaluation: 'No emergency fund has been set up',
+      value: false
+    };
+  }
+
+  public getSettings(aUserSettings: UserSettings): Settings {
+    return {
+      baseCurrency: aUserSettings.baseCurrency,
+      isActive: true,
+      threshold: 0
+    };
+  }
+}
+
+interface Settings extends RuleSettings {
+  baseCurrency: string;
+  threshold: number;
+}
--- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
+++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
@ -1,22 +1,29 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { UserSettings } from '@ghostfolio/common/interfaces';

-import { Rule } from '../../rule';
-
 export class FeeRatioInitialInvestment extends Rule<Settings> {
+  private fees: number;
+  private totalInvestment: number;
+
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private totalInvestment: number,
-    private fees: number
+    totalInvestment: number,
+    fees: number
  ) {
    super(exchangeRateDataService, {
-      name: 'Investment'
+      name: 'Fee Ratio'
    });
+
+    this.fees = fees;
+    this.totalInvestment = totalInvestment;
  }

  public evaluate(ruleSettings: Settings) {
-    const feeRatio = this.fees / this.totalInvestment;
+    const feeRatio = this.totalInvestment
+      ? this.fees / this.totalInvestment
+      : 0;

    if (feeRatio > ruleSettings.threshold) {
      return {
--- a/apps/api/src/services/account-balance/account-balance.module.ts
+++ b/apps/api/src/services/account-balance/account-balance.module.ts
@ -0,0 +1,10 @@
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { Module } from '@nestjs/common';
+
+@Module({
+  exports: [AccountBalanceService],
+  imports: [PrismaModule],
+  providers: [AccountBalanceService]
+})
+export class AccountBalanceModule {}
--- a/apps/api/src/services/account-balance/account-balance.service.ts
+++ b/apps/api/src/services/account-balance/account-balance.service.ts
@ -0,0 +1,42 @@
+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { AccountBalancesResponse } from '@ghostfolio/common/interfaces';
+import { Injectable } from '@nestjs/common';
+import { AccountBalance, Prisma } from '@prisma/client';
+
+@Injectable()
+export class AccountBalanceService {
+  public constructor(private readonly prismaService: PrismaService) {}
+
+  public async createAccountBalance(
+    data: Prisma.AccountBalanceCreateInput
+  ): Promise<AccountBalance> {
+    return this.prismaService.accountBalance.create({
+      data
+    });
+  }
+
+  public async getAccountBalances({
+    accountId,
+    userId
+  }: {
+    accountId: string;
+    userId: string;
+  }): Promise<AccountBalancesResponse> {
+    const balances = await this.prismaService.accountBalance.findMany({
+      orderBy: {
+        date: 'asc'
+      },
+      select: {
+        date: true,
+        id: true,
+        value: true
+      },
+      where: {
+        accountId,
+        userId
+      }
+    });
+
+    return { balances };
+  }
+}
--- a/apps/api/src/services/api/api.service.ts
+++ b/apps/api/src/services/api/api.service.ts
@ -8,14 +8,20 @@ export class ApiService {
  public buildFiltersFromQueryParams({
    filterByAccounts,
    filterByAssetClasses,
+    filterByAssetSubClasses,
+    filterBySearchQuery,
    filterByTags
  }: {
    filterByAccounts?: string;
    filterByAssetClasses?: string;
+    filterByAssetSubClasses?: string;
+    filterBySearchQuery?: string;
    filterByTags?: string;
  }): Filter[] {
    const accountIds = filterByAccounts?.split(',') ?? [];
    const assetClasses = filterByAssetClasses?.split(',') ?? [];
+    const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
+    const searchQuery = filterBySearchQuery?.toLowerCase();
    const tagIds = filterByTags?.split(',') ?? [];

    return [
@ -31,6 +37,16 @@ export class ApiService {
          type: 'ASSET_CLASS'
        };
      }),
+      ...assetSubClasses.map((assetClass) => {
+        return <Filter>{
+          id: assetClass,
+          type: 'ASSET_SUB_CLASS'
+        };
+      }),
+      {
+        id: searchQuery,
+        type: 'SEARCH_QUERY'
+      },
      ...tagIds.map((tagId) => {
        return <Filter>{
          id: tagId,
--- a/apps/api/src/services/configuration/configuration.service.ts
+++ b/apps/api/src/services/configuration/configuration.service.ts
@ -1,4 +1,5 @@
 import { Environment } from '@ghostfolio/api/services/interfaces/environment.interface';
+import { DEFAULT_ROOT_URL } from '@ghostfolio/common/config';
 import { Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
 import { bool, cleanEnv, host, json, num, port, str } from 'envalid';
@ -11,10 +12,6 @@ export class ConfigurationService {
    this.environmentConfiguration = cleanEnv(process.env, {
      ACCESS_TOKEN_SALT: str(),
      ALPHA_VANTAGE_API_KEY: str({ default: '' }),
-      BASE_CURRENCY: str({
-        choices: ['AUD', 'CAD', 'CNY', 'EUR', 'GBP', 'JPY', 'RUB', 'USD'],
-        default: 'USD'
-      }),
      BETTER_UPTIME_API_KEY: str({ default: '' }),
      CACHE_QUOTES_TTL: num({ default: 1 }),
      CACHE_TTL: num({ default: 1 }),
@ -46,7 +43,7 @@ export class ConfigurationService {
      REDIS_HOST: str({ default: 'localhost' }),
      REDIS_PASSWORD: str({ default: '' }),
      REDIS_PORT: port({ default: 6379 }),
-      ROOT_URL: str({ default: 'http://localhost:4200' }),
+      ROOT_URL: str({ default: DEFAULT_ROOT_URL }),
      STRIPE_PUBLIC_KEY: str({ default: '' }),
      STRIPE_SECRET_KEY: str({ default: '' }),
      TWITTER_ACCESS_TOKEN: str({ default: 'dummyAccessToken' }),
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron.service.ts
@ -2,6 +2,7 @@ import {
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Injectable } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';

@ -48,7 +49,7 @@ export class CronService {
          name: GATHER_ASSET_PROFILE_PROCESS,
          opts: {
            ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
          }
        };
      })
--- a/apps/api/src/services/data-gathering/data-gathering.module.ts
+++ b/apps/api/src/services/data-gathering/data-gathering.module.ts
@ -5,6 +5,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 import { DATA_GATHERING_QUEUE } from '@ghostfolio/common/config';
 import { BullModule } from '@nestjs/bull';
@ -28,6 +29,7 @@ import { DataGatheringProcessor } from './data-gathering.processor';
    ExchangeRateDataModule,
    MarketDataModule,
    PrismaModule,
+    PropertyModule,
    SymbolProfileModule
  ],
  providers: [DataGatheringProcessor, DataGatheringService],
--- a/apps/api/src/services/data-gathering/data-gathering.processor.ts
+++ b/apps/api/src/services/data-gathering/data-gathering.processor.ts
@ -13,6 +13,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 import { Job } from 'bull';
 import {
+  addDays,
  format,
  getDate,
  getMonth,
@ -101,15 +102,7 @@ export class DataGatheringProcessor {
          });
        }

-        // Count month one up for iteration
-        currentDate = new Date(
-          Date.UTC(
-            getYear(currentDate),
-            getMonth(currentDate),
-            getDate(currentDate) + 1,
-            0
-          )
-        );
+        currentDate = addDays(currentDate, 1);
      }

      await this.marketDataService.updateMany({ data });
--- a/apps/api/src/services/data-gathering/data-gathering.service.ts
+++ b/apps/api/src/services/data-gathering/data-gathering.service.ts
@ -4,14 +4,20 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
  DATA_GATHERING_QUEUE,
  GATHER_HISTORICAL_MARKET_DATA_PROCESS,
-  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS
+  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
+  PROPERTY_BENCHMARKS
 } from '@ghostfolio/common/config';
-import { DATE_FORMAT, resetHours } from '@ghostfolio/common/helper';
-import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import {
+  DATE_FORMAT,
+  getAssetProfileIdentifier,
+  resetHours
+} from '@ghostfolio/common/helper';
+import { BenchmarkProperty, UniqueAsset } from '@ghostfolio/common/interfaces';
 import { InjectQueue } from '@nestjs/bull';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
@ -30,6 +36,7 @@ export class DataGatheringService {
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly marketDataService: MarketDataService,
    private readonly prismaService: PrismaService,
+    private readonly propertyService: PropertyService,
    private readonly symbolProfileService: SymbolProfileService
  ) {}

@ -120,12 +127,14 @@ export class DataGatheringService {
      uniqueAssets = await this.getUniqueAssets();
    }

-    const assetProfiles = await this.dataProviderService.getAssetProfiles(
-      uniqueAssets
-    );
-    const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
-      uniqueAssets
-    );
+    if (uniqueAssets.length <= 0) {
+      return;
+    }
+
+    const assetProfiles =
+      await this.dataProviderService.getAssetProfiles(uniqueAssets);
+    const symbolProfiles =
+      await this.symbolProfileService.getSymbolProfiles(uniqueAssets);

    for (const [symbol, assetProfile] of Object.entries(assetProfiles)) {
      const symbolMapping = symbolProfiles.find((symbolProfile) => {
@ -140,7 +149,9 @@ export class DataGatheringService {
          });
        } catch (error) {
          Logger.error(
-            `Failed to enhance data for symbol ${symbol} by ${dataEnhancer.getName()}`,
+            `Failed to enhance data for ${symbol} (${
+              assetProfile.dataSource
+            }) by ${dataEnhancer.getName()}`,
            error,
            'DataGatheringService'
          );
@ -221,7 +232,10 @@ export class DataGatheringService {
          name: GATHER_HISTORICAL_MARKET_DATA_PROCESS,
          opts: {
            ...GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}-${format(date, DATE_FORMAT)}`
+            jobId: `${getAssetProfileIdentifier({
+              dataSource,
+              symbol
+            })}-${format(date, DATE_FORMAT)}`
          }
        };
      })
@ -248,6 +262,10 @@ export class DataGatheringService {
      });
  }

+  private getEarliestDate(aStartDate: Date) {
+    return min([aStartDate, subYears(new Date(), 10)]);
+  }
+
  private async getSymbols7D(): Promise<IDataGatheringItem[]> {
    const startDate = subDays(resetHours(new Date()), 7);

@ -314,6 +332,14 @@ export class DataGatheringService {
  }

  private async getSymbolsMax(): Promise<IDataGatheringItem[]> {
+    const benchmarkAssetProfileIdMap: { [key: string]: boolean } = {};
+    (
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as BenchmarkProperty[]) ?? []
+    ).forEach(({ symbolProfileId }) => {
+      benchmarkAssetProfileIdMap[symbolProfileId] = true;
+    });
    const startDate =
      (
        await this.prismaService.order.findFirst({
@ -327,7 +353,7 @@ export class DataGatheringService {
        return {
          dataSource,
          symbol,
-          date: min([startDate, subYears(new Date(), 10)])
+          date: this.getEarliestDate(startDate)
        };
      });

@ -336,6 +362,7 @@ export class DataGatheringService {
        orderBy: [{ symbol: 'asc' }],
        select: {
          dataSource: true,
+          id: true,
          Order: {
            orderBy: [{ date: 'asc' }],
            select: { date: true },
@ -357,9 +384,15 @@ export class DataGatheringService {
        );
      })
      .map((symbolProfile) => {
+        let date = symbolProfile.Order?.[0]?.date ?? startDate;
+
+        if (benchmarkAssetProfileIdMap[symbolProfile.id]) {
+          date = this.getEarliestDate(startDate);
+        }
+
        return {
          ...symbolProfile,
-          date: symbolProfile.Order?.[0]?.date ?? startDate
+          date
        };
      });

--- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
+++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
@ -9,6 +9,7 @@ import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
+import * as Alphavantage from 'alphavantage';
 import { format, isAfter, isBefore, parse } from 'date-fns';

 import { IAlphaVantageHistoricalResponse } from './interfaces/interfaces';
@ -20,7 +21,7 @@ export class AlphaVantageService implements DataProviderInterface {
  public constructor(
    private readonly configurationService: ConfigurationService
  ) {
-    this.alphaVantage = require('alphavantage')({
+    this.alphaVantage = Alphavantage({
      key: this.configurationService.get('ALPHA_VANTAGE_API_KEY')
    });
  }
@ -126,6 +127,9 @@ export class AlphaVantageService implements DataProviderInterface {
    return {
      items: result?.bestMatches?.map((bestMatch) => {
        return {
+          assetClass: undefined,
+          assetSubClass: undefined,
+          currency: bestMatch['8. currency'],
          dataSource: this.getName(),
          name: bestMatch['2. name'],
          symbol: bestMatch['1. symbol']
--- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
+++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
@ -1,10 +1,13 @@
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_REQUEST_TIMEOUT
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { DataProviderInfo } from '@ghostfolio/common/interfaces';
 import { Granularity } from '@ghostfolio/common/types';
@ -15,19 +18,14 @@ import {
  DataSource,
  SymbolProfile
 } from '@prisma/client';
-import bent from 'bent';
 import { format, fromUnixTime, getUnixTime } from 'date-fns';
+import got from 'got';

@Injectable()
 export class CoinGeckoService implements DataProviderInterface {
-  private baseCurrency: string;
  private readonly URL = 'https://api.coingecko.com/api/v3';

-  public constructor(
-    private readonly configurationService: ConfigurationService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  public constructor() {}

  public canHandle(symbol: string) {
    return true;
@ -39,14 +37,22 @@ export class CoinGeckoService implements DataProviderInterface {
    const response: Partial<SymbolProfile> = {
      assetClass: AssetClass.CASH,
      assetSubClass: AssetSubClass.CRYPTOCURRENCY,
-      currency: this.baseCurrency,
+      currency: DEFAULT_CURRENCY,
      dataSource: this.getName(),
      symbol: aSymbol
    };

    try {
-      const get = bent(`${this.URL}/coins/${aSymbol}`, 'GET', 'json', 200);
-      const { name } = await get();
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { name } = await got(`${this.URL}/coins/${aSymbol}`, {
+        // @ts-ignore
+        signal: abortController.signal
+      }).json<any>();

      response.name = name;
    } catch (error) {
@ -79,17 +85,23 @@ export class CoinGeckoService implements DataProviderInterface {
    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
  }> {
    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { prices } = await got(
        `${
          this.URL
-        }/coins/${aSymbol}/market_chart/range?vs_currency=${this.baseCurrency.toLowerCase()}&from=${getUnixTime(
+        }/coins/${aSymbol}/market_chart/range?vs_currency=${DEFAULT_CURRENCY.toLowerCase()}&from=${getUnixTime(
          from
        )}&to=${getUnixTime(to)}`,
-        'GET',
-        'json',
-        200
-      );
-      const { prices } = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      const result: {
        [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@ -132,23 +144,29 @@ export class CoinGeckoService implements DataProviderInterface {
    }

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const response = await got(
        `${this.URL}/simple/price?ids=${aSymbols.join(
          ','
-        )}&vs_currencies=${this.baseCurrency.toLowerCase()}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        )}&vs_currencies=${DEFAULT_CURRENCY.toLowerCase()}`,
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      for (const symbol in response) {
        if (Object.prototype.hasOwnProperty.call(response, symbol)) {
          results[symbol] = {
-            currency: this.baseCurrency,
+            currency: DEFAULT_CURRENCY,
            dataProviderInfo: this.getDataProviderInfo(),
            dataSource: DataSource.COINGECKO,
-            marketPrice: response[symbol][this.baseCurrency.toLowerCase()],
+            marketPrice: response[symbol][DEFAULT_CURRENCY.toLowerCase()],
            marketState: 'open'
          };
        }
@ -174,8 +192,16 @@ export class CoinGeckoService implements DataProviderInterface {
    let items: LookupItem[] = [];

    try {
-      const get = bent(`${this.URL}/search?query=${query}`, 'GET', 'json', 200);
-      const { coins } = await get();
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { coins } = await got(`${this.URL}/search?query=${query}`, {
+        // @ts-ignore
+        signal: abortController.signal
+      }).json<any>();

      items = coins.map(({ id: symbol, name }) => {
        return {
@ -183,7 +209,7 @@ export class CoinGeckoService implements DataProviderInterface {
          symbol,
          assetClass: AssetClass.CASH,
          assetSubClass: AssetSubClass.CRYPTOCURRENCY,
-          currency: this.baseCurrency,
+          currency: DEFAULT_CURRENCY,
          dataSource: this.getName()
        };
      });
--- a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts
@ -4,14 +4,18 @@ import { TrackinsightDataEnhancerService } from '@ghostfolio/api/services/data-p
 import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';
 import { Module } from '@nestjs/common';

+import { DataEnhancerService } from './data-enhancer.service';
+
@Module({
  exports: [
-    'DataEnhancers',
+    DataEnhancerService,
    TrackinsightDataEnhancerService,
-    YahooFinanceDataEnhancerService
+    YahooFinanceDataEnhancerService,
+    'DataEnhancers'
  ],
  imports: [ConfigurationModule, CryptocurrencyModule],
  providers: [
+    DataEnhancerService,
    TrackinsightDataEnhancerService,
    YahooFinanceDataEnhancerService,
    {
--- a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.service.ts
@ -0,0 +1,44 @@
+import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
+import { HttpException, Inject, Injectable } from '@nestjs/common';
+import { Prisma } from '@prisma/client';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
+
+@Injectable()
+export class DataEnhancerService {
+  public constructor(
+    @Inject('DataEnhancers')
+    private readonly dataEnhancers: DataEnhancerInterface[]
+  ) {}
+
+  public async enhance(aName: string) {
+    const dataEnhancer = this.dataEnhancers.find((dataEnhancer) => {
+      return dataEnhancer.getName() === aName;
+    });
+
+    if (!dataEnhancer) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.NOT_FOUND),
+        StatusCodes.NOT_FOUND
+      );
+    }
+
+    try {
+      const assetProfile = await dataEnhancer.enhance({
+        response: {
+          assetClass: 'EQUITY',
+          assetSubClass: 'ETF'
+        },
+        symbol: dataEnhancer.getTestSymbol()
+      });
+
+      if (
+        (assetProfile.countries as unknown as Prisma.JsonArray)?.length > 0 &&
+        (assetProfile.sectors as unknown as Prisma.JsonArray)?.length > 0
+      ) {
+        return true;
+      }
+    } catch {}
+
+    return false;
+  }
+}
--- a/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts
@ -1,15 +1,14 @@
 import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
+import { DEFAULT_REQUEST_TIMEOUT } from '@ghostfolio/common/config';
 import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import bent from 'bent';
-
-const getJSON = bent('json');
+import got from 'got';

@Injectable()
 export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
-  private static baseUrl = 'https://data.trackinsight.com';
+  private static baseUrl = 'https://www.trackinsight.com/data-api';
  private static countries = require('countries-list/dist/countries.json');
  private static countriesMapping = {
    'Russian Federation': 'Russia'
@ -34,27 +33,83 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
      return response;
    }

-    const profile = await getJSON(
-      `${TrackinsightDataEnhancerService.baseUrl}/data-api/funds/${symbol}.json`
-    ).catch(() => {
-      return {};
-    });
+    let abortController = new AbortController();

-    const isin = profile.isin?.split(';')?.[0];
+    setTimeout(() => {
+      abortController.abort();
+    }, DEFAULT_REQUEST_TIMEOUT);
+
+    const profile = await got(
+      `${TrackinsightDataEnhancerService.baseUrl}/funds/${symbol}.json`,
+      {
+        // @ts-ignore
+        signal: abortController.signal
+      }
+    )
+      .json<any>()
+      .catch(() => {
+        const abortController = new AbortController();
+
+        setTimeout(() => {
+          abortController.abort();
+        }, DEFAULT_REQUEST_TIMEOUT);
+
+        return got(
+          `${TrackinsightDataEnhancerService.baseUrl}/funds/${symbol.split(
+            '.'
+          )?.[0]}.json`,
+          {
+            // @ts-ignore
+            signal: abortController.signal
+          }
+        )
+          .json<any>()
+          .catch(() => {
+            return {};
+          });
+      });
+
+    const isin = profile?.isin?.split(';')?.[0];

    if (isin) {
      response.isin = isin;
    }

-    const holdings = await getJSON(
-      `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol}.json`
-    ).catch(() => {
-      return getJSON(
-        `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
-          symbol.split('.')?.[0]
-        }.json`
-      );
-    });
+    abortController = new AbortController();
+
+    setTimeout(() => {
+      abortController.abort();
+    }, DEFAULT_REQUEST_TIMEOUT);
+
+    const holdings = await got(
+      `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol}.json`,
+      {
+        // @ts-ignore
+        signal: abortController.signal
+      }
+    )
+      .json<any>()
+      .catch(() => {
+        const abortController = new AbortController();
+
+        setTimeout(() => {
+          abortController.abort();
+        }, DEFAULT_REQUEST_TIMEOUT);
+
+        return got(
+          `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol.split(
+            '.'
+          )?.[0]}.json`,
+          {
+            // @ts-ignore
+            signal: abortController.signal
+          }
+        )
+          .json<any>()
+          .catch(() => {
+            return {};
+          });
+      });

    if (holdings?.weight < 0.95) {
      // Skip if data is inaccurate
@ -112,4 +167,8 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
  public getName() {
    return 'TRACKINSIGHT';
  }
+
+  public getTestSymbol() {
+    return 'QQQ';
+  }
 }
--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.ts
@ -1,4 +1,3 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';

 import { YahooFinanceDataEnhancerService } from './yahoo-finance.service';
@ -26,16 +25,13 @@ jest.mock(
 );

 describe('YahooFinanceDataEnhancerService', () => {
-  let configurationService: ConfigurationService;
  let cryptocurrencyService: CryptocurrencyService;
  let yahooFinanceDataEnhancerService: YahooFinanceDataEnhancerService;

  beforeAll(async () => {
-    configurationService = new ConfigurationService();
    cryptocurrencyService = new CryptocurrencyService();

    yahooFinanceDataEnhancerService = new YahooFinanceDataEnhancerService(
-      configurationService,
      cryptocurrencyService
    );
  });
--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
@ -1,13 +1,13 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
 import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
-import { UNKNOWN_KEY } from '@ghostfolio/common/config';
+import { DEFAULT_CURRENCY, UNKNOWN_KEY } from '@ghostfolio/common/config';
 import { isCurrency } from '@ghostfolio/common/helper';
 import { Injectable, Logger } from '@nestjs/common';
 import {
  AssetClass,
  AssetSubClass,
  DataSource,
+  Prisma,
  SymbolProfile
 } from '@prisma/client';
 import { countries } from 'countries-list';
@ -16,23 +16,18 @@ import type { Price } from 'yahoo-finance2/dist/esm/src/modules/quoteSummary-ifa

@Injectable()
 export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
-  private baseCurrency: string;
-
  public constructor(
-    private readonly configurationService: ConfigurationService,
    private readonly cryptocurrencyService: CryptocurrencyService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  public convertFromYahooFinanceSymbol(aYahooFinanceSymbol: string) {
    let symbol = aYahooFinanceSymbol.replace(
-      new RegExp(`-${this.baseCurrency}$`),
-      this.baseCurrency
+      new RegExp(`-${DEFAULT_CURRENCY}$`),
+      DEFAULT_CURRENCY
    );

-    if (symbol.includes('=X') && !symbol.includes(this.baseCurrency)) {
-      symbol = `${this.baseCurrency}${symbol}`;
+    if (symbol.includes('=X') && !symbol.includes(DEFAULT_CURRENCY)) {
+      symbol = `${DEFAULT_CURRENCY}${symbol}`;
    }

    return symbol.replace('=X', '');
@ -47,21 +42,18 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
   */
  public convertToYahooFinanceSymbol(aSymbol: string) {
    if (
-      aSymbol.includes(this.baseCurrency) &&
-      aSymbol.length > this.baseCurrency.length
+      aSymbol.includes(DEFAULT_CURRENCY) &&
+      aSymbol.length > DEFAULT_CURRENCY.length
    ) {
      if (
        isCurrency(
-          aSymbol.substring(0, aSymbol.length - this.baseCurrency.length)
+          aSymbol.substring(0, aSymbol.length - DEFAULT_CURRENCY.length)
        )
      ) {
        return `${aSymbol}=X`;
      } else if (
        this.cryptocurrencyService.isCryptocurrency(
-          aSymbol.replace(
-            new RegExp(`-${this.baseCurrency}$`),
-            this.baseCurrency
-          )
+          aSymbol.replace(new RegExp(`-${DEFAULT_CURRENCY}$`), DEFAULT_CURRENCY)
        )
      ) {
        // Add a dash before the last three characters
@ -69,8 +61,8 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
        // DOGEUSD -> DOGE-USD
        // SOL1USD -> SOL1-USD
        return aSymbol.replace(
-          new RegExp(`-?${this.baseCurrency}$`),
-          `-${this.baseCurrency}`
+          new RegExp(`-?${DEFAULT_CURRENCY}$`),
+          `-${DEFAULT_CURRENCY}`
        );
      }
    }
@ -99,15 +91,14 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
        yahooSymbol = quotes[0].symbol;
      }

-      const { countries, sectors, url } = await this.getAssetProfile(
-        yahooSymbol
-      );
+      const { countries, sectors, url } =
+        await this.getAssetProfile(yahooSymbol);

-      if (countries) {
+      if ((countries as unknown as Prisma.JsonArray)?.length > 0) {
        response.countries = countries;
      }

-      if (sectors) {
+      if ((sectors as unknown as Prisma.JsonArray)?.length > 0) {
        response.sectors = sectors;
      }

@ -234,6 +225,10 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
    return DataSource.YAHOO;
  }

+  public getTestSymbol() {
+    return 'AAPL';
+  }
+
  public parseAssetClass({
    quoteType,
    shortName
--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
@ -5,6 +5,10 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_REQUEST_TIMEOUT
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT, isCurrency } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
@ -14,21 +18,19 @@ import {
  DataSource,
  SymbolProfile
 } from '@prisma/client';
-import bent from 'bent';
 import Big from 'big.js';
 import { format, isToday } from 'date-fns';
+import got from 'got';

@Injectable()
 export class EodHistoricalDataService implements DataProviderInterface {
  private apiKey: string;
-  private baseCurrency: string;
  private readonly URL = 'https://eodhistoricaldata.com/api';

  public constructor(
    private readonly configurationService: ConfigurationService
  ) {
    this.apiKey = this.configurationService.get('EOD_HISTORICAL_DATA_API_KEY');
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
  }

  public canHandle(symbol: string) {
@ -76,19 +78,24 @@ export class EodHistoricalDataService implements DataProviderInterface {
    const symbol = this.convertToEodSymbol(aSymbol);

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const response = await got(
        `${this.URL}/eod/${symbol}?api_token=${
          this.apiKey
        }&fmt=json&from=${format(from, DATE_FORMAT)}&to=${format(
          to,
          DATE_FORMAT
        )}&period={aGranularity}`,
-        'GET',
-        'json',
-        200
-      );
-
-      const response = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      return response.reduce(
        (result, historicalItem, index, array) => {
@ -136,16 +143,21 @@ export class EodHistoricalDataService implements DataProviderInterface {
    }

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const realTimeResponse = await got(
        `${this.URL}/real-time/${symbols[0]}?api_token=${
          this.apiKey
        }&fmt=json&s=${symbols.join(',')}`,
-        'GET',
-        'json',
-        200
-      );
-
-      const realTimeResponse = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      const quotes =
        symbols.length === 1 ? [realTimeResponse] : realTimeResponse;
@ -174,7 +186,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
          })?.currency;

          result[this.convertFromEodSymbol(code)] = {
-            currency: currency ?? this.baseCurrency,
+            currency: currency ?? DEFAULT_CURRENCY,
            dataSource: DataSource.EOD_HISTORICAL_DATA,
            marketPrice: close,
            marketState: isToday(new Date(timestamp * 1000)) ? 'open' : 'closed'
@ -185,24 +197,24 @@ export class EodHistoricalDataService implements DataProviderInterface {
        {}
      );

-      if (response[`${this.baseCurrency}GBP`]) {
-        response[`${this.baseCurrency}GBp`] = {
-          ...response[`${this.baseCurrency}GBP`],
-          currency: `${this.baseCurrency}GBp`,
+      if (response[`${DEFAULT_CURRENCY}GBP`]) {
+        response[`${DEFAULT_CURRENCY}GBp`] = {
+          ...response[`${DEFAULT_CURRENCY}GBP`],
+          currency: `${DEFAULT_CURRENCY}GBp`,
          marketPrice: this.getConvertedValue({
-            symbol: `${this.baseCurrency}GBp`,
-            value: response[`${this.baseCurrency}GBP`].marketPrice
+            symbol: `${DEFAULT_CURRENCY}GBp`,
+            value: response[`${DEFAULT_CURRENCY}GBP`].marketPrice
          })
        };
      }

-      if (response[`${this.baseCurrency}ILS`]) {
-        response[`${this.baseCurrency}ILA`] = {
-          ...response[`${this.baseCurrency}ILS`],
-          currency: `${this.baseCurrency}ILA`,
+      if (response[`${DEFAULT_CURRENCY}ILS`]) {
+        response[`${DEFAULT_CURRENCY}ILA`] = {
+          ...response[`${DEFAULT_CURRENCY}ILS`],
+          currency: `${DEFAULT_CURRENCY}ILA`,
          marketPrice: this.getConvertedValue({
-            symbol: `${this.baseCurrency}ILA`,
-            value: response[`${this.baseCurrency}ILS`].marketPrice
+            symbol: `${DEFAULT_CURRENCY}ILA`,
+            value: response[`${DEFAULT_CURRENCY}ILS`].marketPrice
          })
        };
      }
@ -271,7 +283,6 @@ export class EodHistoricalDataService implements DataProviderInterface {
    if (symbol.endsWith('.FOREX')) {
      symbol = symbol.replace('GBX', 'GBp');
      symbol = symbol.replace('.FOREX', '');
-      symbol = `${this.baseCurrency}${symbol}`;
    }

    return symbol;
@ -280,21 +291,22 @@ export class EodHistoricalDataService implements DataProviderInterface {
  /**
   * Converts a symbol to a EOD symbol
   *
-   * Currency:  USDCHF  -> CHF.FOREX
+   * Currency:  USDCHF  -> USDCHF.FOREX
   */
  private convertToEodSymbol(aSymbol: string) {
    if (
-      aSymbol.startsWith(this.baseCurrency) &&
-      aSymbol.length > this.baseCurrency.length
+      aSymbol.startsWith(DEFAULT_CURRENCY) &&
+      aSymbol.length > DEFAULT_CURRENCY.length
    ) {
      if (
        isCurrency(
-          aSymbol.substring(0, aSymbol.length - this.baseCurrency.length)
+          aSymbol.substring(0, aSymbol.length - DEFAULT_CURRENCY.length)
        )
      ) {
-        return `${aSymbol
-          .replace('GBp', 'GBX')
-          .replace(this.baseCurrency, '')}.FOREX`;
+        let symbol = aSymbol;
+        symbol = symbol.replace('GBp', 'GBX');
+
+        return `${symbol}.FOREX`;
      }
    }

@ -308,10 +320,10 @@ export class EodHistoricalDataService implements DataProviderInterface {
    symbol: string;
    value: number;
  }) {
-    if (symbol === `${this.baseCurrency}GBp`) {
+    if (symbol === `${DEFAULT_CURRENCY}GBp`) {
      // Convert GPB to GBp (pence)
      return new Big(value).mul(100).toNumber();
-    } else if (symbol === `${this.baseCurrency}ILA`) {
+    } else if (symbol === `${DEFAULT_CURRENCY}ILA`) {
      // Convert ILS to ILA
      return new Big(value).mul(100).toNumber();
    }
@ -329,13 +341,19 @@ export class EodHistoricalDataService implements DataProviderInterface {
    let searchResult = [];

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const response = await got(
        `${this.URL}/search/${aQuery}?api_token=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      searchResult = response.map(
        ({ Code, Currency, Exchange, ISIN: isin, Name: name, Type }) => {
--- a/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts
+++ b/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts
@ -5,18 +5,21 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_REQUEST_TIMEOUT
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
 import { DataProviderInfo } from '@ghostfolio/common/interfaces';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import { format, isAfter, isBefore, isSameDay } from 'date-fns';
+import got from 'got';

@Injectable()
 export class FinancialModelingPrepService implements DataProviderInterface {
  private apiKey: string;
-  private baseCurrency: string;
  private readonly URL = 'https://financialmodelingprep.com/api/v3';

  public constructor(
@ -25,7 +28,6 @@ export class FinancialModelingPrepService implements DataProviderInterface {
    this.apiKey = this.configurationService.get(
      'FINANCIAL_MODELING_PREP_API_KEY'
    );
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
  }

  public canHandle(symbol: string) {
@ -64,13 +66,19 @@ export class FinancialModelingPrepService implements DataProviderInterface {
    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
  }> {
    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { historical } = await got(
        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const { historical } = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      const result: {
        [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@ -115,17 +123,23 @@ export class FinancialModelingPrepService implements DataProviderInterface {
    }

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const response = await got(
        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      for (const { price, symbol } of response) {
        results[symbol] = {
-          currency: this.baseCurrency,
+          currency: DEFAULT_CURRENCY,
          dataProviderInfo: this.getDataProviderInfo(),
          dataSource: DataSource.FINANCIAL_MODELING_PREP,
          marketPrice: price,
@ -153,13 +167,19 @@ export class FinancialModelingPrepService implements DataProviderInterface {
    let items: LookupItem[] = [];

    try {
-      const get = bent(
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const result = await got(
        `${this.URL}/search?query=${query}&apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const result = await get();
+        {
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

      items = result.map(({ currency, name, symbol }) => {
        return {
--- a/apps/api/src/services/data-provider/interfaces/data-enhancer.interface.ts
+++ b/apps/api/src/services/data-provider/interfaces/data-enhancer.interface.ts
@ -10,4 +10,6 @@ export interface DataEnhancerInterface {
  }): Promise<Partial<SymbolProfile>>;

  getName(): string;
+
+  getTestSymbol(): string;
 }
--- a/apps/api/src/services/data-provider/manual/manual.service.ts
+++ b/apps/api/src/services/data-provider/manual/manual.service.ts
@ -6,6 +6,7 @@ import {
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import { DEFAULT_REQUEST_TIMEOUT } from '@ghostfolio/common/config';
 import {
  DATE_FORMAT,
  extractNumberFromString,
@ -14,10 +15,10 @@ import {
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import * as cheerio from 'cheerio';
 import { isUUID } from 'class-validator';
 import { addDays, format, isBefore } from 'date-fns';
+import got from 'got';

@Injectable()
 export class ManualService implements DataProviderInterface {
@ -95,10 +96,19 @@ export class ManualService implements DataProviderInterface {
        return {};
      }

-      const get = bent(url, 'GET', 'string', 200, headers);
+      const abortController = new AbortController();

-      const html = await get();
-      const $ = cheerio.load(html);
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { body } = await got(url, {
+        headers,
+        // @ts-ignore
+        signal: abortController.signal
+      });
+
+      const $ = cheerio.load(body);

      const value = extractNumberFromString($(selector).text());

--- a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts
+++ b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts
@ -5,13 +5,16 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
-import { ghostfolioFearAndGreedIndexSymbol } from '@ghostfolio/common/config';
+import {
+  DEFAULT_REQUEST_TIMEOUT,
+  ghostfolioFearAndGreedIndexSymbol
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import { format } from 'date-fns';
+import got from 'got';

@Injectable()
 export class RapidApiService implements DataProviderInterface {
@ -135,19 +138,25 @@ export class RapidApiService implements DataProviderInterface {
    oneYearAgo: { value: number; valueText: string };
  }> {
    try {
-      const get = bent(
-        `https://fear-and-greed-index.p.rapidapi.com/v1/fgi`,
-        'GET',
-        'json',
-        200,
-        {
-          useQueryString: true,
-          'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
-          'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
-        }
-      );
+      const abortController = new AbortController();
+
+      setTimeout(() => {
+        abortController.abort();
+      }, DEFAULT_REQUEST_TIMEOUT);
+
+      const { fgi } = await got(
+        `https://fear-and-greed-index.p.rapidapi.com/v1/fgi`,
+        {
+          headers: {
+            useQueryString: 'true',
+            'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
+            'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
+          },
+          // @ts-ignore
+          signal: abortController.signal
+        }
+      ).json<any>();

-      const { fgi } = await get();
      return fgi;
    } catch (error) {
      Logger.error(error, 'RapidApiService');
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@ -1,5 +1,4 @@
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
 import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
@ -7,6 +6,7 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { DEFAULT_CURRENCY } from '@ghostfolio/common/config';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
@ -18,15 +18,10 @@ import { Quote } from 'yahoo-finance2/dist/esm/src/modules/quote';

@Injectable()
 export class YahooFinanceService implements DataProviderInterface {
-  private baseCurrency: string;
-
  public constructor(
-    private readonly configurationService: ConfigurationService,
    private readonly cryptocurrencyService: CryptocurrencyService,
    private readonly yahooFinanceDataEnhancerService: YahooFinanceDataEnhancerService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
+  ) {}

  public canHandle(symbol: string) {
    return true;
@ -212,50 +207,50 @@ export class YahooFinanceService implements DataProviderInterface {
        };

        if (
-          symbol === `${this.baseCurrency}GBP` &&
-          yahooFinanceSymbols.includes(`${this.baseCurrency}GBp=X`)
+          symbol === `${DEFAULT_CURRENCY}GBP` &&
+          yahooFinanceSymbols.includes(`${DEFAULT_CURRENCY}GBp=X`)
        ) {
          // Convert GPB to GBp (pence)
-          response[`${this.baseCurrency}GBp`] = {
+          response[`${DEFAULT_CURRENCY}GBp`] = {
            ...response[symbol],
            currency: 'GBp',
            marketPrice: this.getConvertedValue({
-              symbol: `${this.baseCurrency}GBp`,
+              symbol: `${DEFAULT_CURRENCY}GBp`,
              value: response[symbol].marketPrice
            })
          };
        } else if (
-          symbol === `${this.baseCurrency}ILS` &&
-          yahooFinanceSymbols.includes(`${this.baseCurrency}ILA=X`)
+          symbol === `${DEFAULT_CURRENCY}ILS` &&
+          yahooFinanceSymbols.includes(`${DEFAULT_CURRENCY}ILA=X`)
        ) {
          // Convert ILS to ILA
-          response[`${this.baseCurrency}ILA`] = {
+          response[`${DEFAULT_CURRENCY}ILA`] = {
            ...response[symbol],
            currency: 'ILA',
            marketPrice: this.getConvertedValue({
-              symbol: `${this.baseCurrency}ILA`,
+              symbol: `${DEFAULT_CURRENCY}ILA`,
              value: response[symbol].marketPrice
            })
          };
        } else if (
-          symbol === `${this.baseCurrency}ZAR` &&
-          yahooFinanceSymbols.includes(`${this.baseCurrency}ZAc=X`)
+          symbol === `${DEFAULT_CURRENCY}ZAR` &&
+          yahooFinanceSymbols.includes(`${DEFAULT_CURRENCY}ZAc=X`)
        ) {
          // Convert ZAR to ZAc (cents)
-          response[`${this.baseCurrency}ZAc`] = {
+          response[`${DEFAULT_CURRENCY}ZAc`] = {
            ...response[symbol],
            currency: 'ZAc',
            marketPrice: this.getConvertedValue({
-              symbol: `${this.baseCurrency}ZAc`,
+              symbol: `${DEFAULT_CURRENCY}ZAc`,
              value: response[symbol].marketPrice
            })
          };
        }
      }

-      if (yahooFinanceSymbols.includes(`${this.baseCurrency}USX=X`)) {
+      if (yahooFinanceSymbols.includes(`${DEFAULT_CURRENCY}USX=X`)) {
        // Convert USD to USX (cent)
-        response[`${this.baseCurrency}USX`] = {
+        response[`${DEFAULT_CURRENCY}USX`] = {
          currency: 'USX',
          dataSource: this.getName(),
          marketPrice: new Big(1).mul(100).toNumber(),
@ -303,8 +298,8 @@ export class YahooFinanceService implements DataProviderInterface {
            (quoteType === 'CRYPTOCURRENCY' &&
              this.cryptocurrencyService.isCryptocurrency(
                symbol.replace(
-                  new RegExp(`-${this.baseCurrency}$`),
-                  this.baseCurrency
+                  new RegExp(`-${DEFAULT_CURRENCY}$`),
+                  DEFAULT_CURRENCY
                )
              )) ||
            quoteTypes.includes(quoteType)
@ -314,7 +309,7 @@ export class YahooFinanceService implements DataProviderInterface {
          if (quoteType === 'CRYPTOCURRENCY') {
            // Only allow cryptocurrencies in base currency to avoid having redundancy in the database.
            // Transactions need to be converted manually to the base currency before
-            return symbol.includes(this.baseCurrency);
+            return symbol.includes(DEFAULT_CURRENCY);
          } else if (quoteType === 'FUTURE') {
            // Allow GC=F, but not MGC=F
            return symbol.length === 4;
@ -373,13 +368,13 @@ export class YahooFinanceService implements DataProviderInterface {
    symbol: string;
    value: number;
  }) {
-    if (symbol === `${this.baseCurrency}GBp`) {
+    if (symbol === `${DEFAULT_CURRENCY}GBp`) {
      // Convert GPB to GBp (pence)
      return new Big(value).mul(100).toNumber();
-    } else if (symbol === `${this.baseCurrency}ILA`) {
+    } else if (symbol === `${DEFAULT_CURRENCY}ILA`) {
      // Convert ILS to ILA
      return new Big(value).mul(100).toNumber();
-    } else if (symbol === `${this.baseCurrency}ZAc`) {
+    } else if (symbol === `${DEFAULT_CURRENCY}ZAc`) {
      // Convert ZAR to ZAc (cents)
      return new Big(value).mul(100).toNumber();
    }
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
@ -1,10 +1,12 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
+import {
+  DEFAULT_CURRENCY,
+  PROPERTY_CURRENCIES
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';
 import { Injectable, Logger } from '@nestjs/common';
 import { format, isToday } from 'date-fns';
@ -12,13 +14,11 @@ import { isNumber, uniq } from 'lodash';

@Injectable()
 export class ExchangeRateDataService {
-  private baseCurrency: string;
  private currencies: string[] = [];
  private currencyPairs: IDataGatheringItem[] = [];
  private exchangeRates: { [currencyPair: string]: number } = {};

  public constructor(
-    private readonly configurationService: ConfigurationService,
    private readonly dataProviderService: DataProviderService,
    private readonly marketDataService: MarketDataService,
    private readonly prismaService: PrismaService,
@ -26,15 +26,23 @@ export class ExchangeRateDataService {
  ) {}

  public getCurrencies() {
-    return this.currencies?.length > 0 ? this.currencies : [this.baseCurrency];
+    return this.currencies?.length > 0 ? this.currencies : [DEFAULT_CURRENCY];
  }

  public getCurrencyPairs() {
    return this.currencyPairs;
  }

+  public hasCurrencyPair(currency1: string, currency2: string) {
+    return this.currencyPairs.some(({ symbol }) => {
+      return (
+        symbol === `${currency1}${currency2}` ||
+        symbol === `${currency2}${currency1}`
+      );
+    });
+  }
+
  public async initialize() {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
    this.currencies = await this.prepareCurrencies();
    this.currencyPairs = [];
    this.exchangeRates = {};
@ -104,9 +112,9 @@ export class ExchangeRateDataService {
      if (!this.exchangeRates[symbol]) {
        // Not found, calculate indirectly via base currency
        this.exchangeRates[symbol] =
-          resultExtended[`${currency1}${this.baseCurrency}`]?.[date]
+          resultExtended[`${currency1}${DEFAULT_CURRENCY}`]?.[date]
            ?.marketPrice *
-          resultExtended[`${this.baseCurrency}${currency2}`]?.[date]
+          resultExtended[`${DEFAULT_CURRENCY}${currency2}`]?.[date]
            ?.marketPrice;

        // Calculate the opposite direction
@ -125,17 +133,18 @@ export class ExchangeRateDataService {
      return 0;
    }

-    let factor = 1;
+    let factor: number;

-    if (aFromCurrency !== aToCurrency) {
+    if (aFromCurrency === aToCurrency) {
+      factor = 1;
+    } else {
      if (this.exchangeRates[`${aFromCurrency}${aToCurrency}`]) {
        factor = this.exchangeRates[`${aFromCurrency}${aToCurrency}`];
      } else {
        // Calculate indirectly via base currency
        const factor1 =
-          this.exchangeRates[`${aFromCurrency}${this.baseCurrency}`];
-        const factor2 =
-          this.exchangeRates[`${this.baseCurrency}${aToCurrency}`];
+          this.exchangeRates[`${aFromCurrency}${DEFAULT_CURRENCY}`];
+        const factor2 = this.exchangeRates[`${DEFAULT_CURRENCY}${aToCurrency}`];

        factor = factor1 * factor2;

@ -171,7 +180,9 @@ export class ExchangeRateDataService {

    let factor: number;

-    if (aFromCurrency !== aToCurrency) {
+    if (aFromCurrency === aToCurrency) {
+      factor = 1;
+    } else {
      const dataSource =
        this.dataProviderService.getDataSourceForExchangeRates();
      const symbol = `${aFromCurrency}${aToCurrency}`;
@ -191,28 +202,28 @@ export class ExchangeRateDataService {
        let marketPriceBaseCurrencyToCurrency: number;

        try {
-          if (this.baseCurrency === aFromCurrency) {
+          if (aFromCurrency === DEFAULT_CURRENCY) {
            marketPriceBaseCurrencyFromCurrency = 1;
          } else {
            marketPriceBaseCurrencyFromCurrency = (
              await this.marketDataService.get({
                dataSource,
                date: aDate,
-                symbol: `${this.baseCurrency}${aFromCurrency}`
+                symbol: `${DEFAULT_CURRENCY}${aFromCurrency}`
              })
            )?.marketPrice;
          }
        } catch {}

        try {
-          if (this.baseCurrency === aToCurrency) {
+          if (aToCurrency === DEFAULT_CURRENCY) {
            marketPriceBaseCurrencyToCurrency = 1;
          } else {
            marketPriceBaseCurrencyToCurrency = (
              await this.marketDataService.get({
                dataSource,
                date: aDate,
-                symbol: `${this.baseCurrency}${aToCurrency}`
+                symbol: `${DEFAULT_CURRENCY}${aToCurrency}`
              })
            )?.marketPrice;
          }
@ -282,14 +293,14 @@ export class ExchangeRateDataService {
  private prepareCurrencyPairs(aCurrencies: string[]) {
    return aCurrencies
      .filter((currency) => {
-        return currency !== this.baseCurrency;
+        return currency !== DEFAULT_CURRENCY;
      })
      .map((currency) => {
        return {
-          currency1: this.baseCurrency,
+          currency1: DEFAULT_CURRENCY,
          currency2: currency,
          dataSource: this.dataProviderService.getDataSourceForExchangeRates(),
-          symbol: `${this.baseCurrency}${currency}`
+          symbol: `${DEFAULT_CURRENCY}${currency}`
        };
      });
  }
--- a/apps/api/src/services/i18n/i18n.service.ts
+++ b/apps/api/src/services/i18n/i18n.service.ts
@ -0,0 +1,67 @@
+import { readFileSync, readdirSync } from 'fs';
+import { join } from 'path';
+
+import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
+import { Logger } from '@nestjs/common';
+import * as cheerio from 'cheerio';
+
+export class I18nService {
+  private localesPath = join(__dirname, 'assets', 'locales');
+  private translations: { [locale: string]: cheerio.CheerioAPI } = {};
+
+  public constructor() {
+    this.loadFiles();
+  }
+
+  public getTranslation({
+    id,
+    languageCode
+  }: {
+    id: string;
+    languageCode: string;
+  }): string {
+    const $ = this.translations[languageCode];
+
+    if (!$) {
+      Logger.warn(`Translation not found for locale '${languageCode}'`);
+    }
+
+    const translatedText = $(
+      `trans-unit[id="${id}"] > ${
+        languageCode === DEFAULT_LANGUAGE_CODE ? 'source' : 'target'
+      }`
+    ).text();
+
+    if (!translatedText) {
+      Logger.warn(
+        `Translation not found for id '${id}' in locale '${languageCode}'`
+      );
+    }
+
+    return translatedText;
+  }
+
+  private loadFiles() {
+    try {
+      const files = readdirSync(this.localesPath, 'utf-8');
+
+      for (const file of files) {
+        const xmlData = readFileSync(join(this.localesPath, file), 'utf8');
+        this.translations[this.parseLanguageCode(file)] =
+          this.parseXml(xmlData);
+      }
+    } catch (error) {
+      Logger.error(error, 'I18nService');
+    }
+  }
+
+  private parseLanguageCode(aFileName: string) {
+    const match = aFileName.match(/\.([a-zA-Z]+)\.xlf$/);
+
+    return match ? match[1] : DEFAULT_LANGUAGE_CODE;
+  }
+
+  private parseXml(xmlData: string): cheerio.CheerioAPI {
+    return cheerio.load(xmlData, { xmlMode: true });
+  }
+}
--- a/Show More
+++ b/Show More