diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/_index.md b/content/en/docs/refguide/modeling/application-logic/expressions/_index.md
index cad833296c5..c272660a5ec 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/_index.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/_index.md
@@ -63,7 +63,7 @@ This way the first statement gets evaluated.
 
 Mendix provides you with a number of system items which describe the current user's session. You can use these in the same way as any other named item.
 
-### $currentUser
+### `$currentUser`
 
 This is an object of type `System.User` which contains the attributes for the currently signed-in user.
 
@@ -71,7 +71,7 @@ This is an object of type `System.User` which contains the attributes for the cu
 For performance reasons, this information is cached. If you need the current value of attributes which might have changed during the session, you should retrieve the latest data from the database.
 {{% /alert %}}
 
-### $currentSession
+### `$currentSession`
 
 This is an object of type `System.Session` which contains the attributes for the current user session.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/add-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/add-date-function-calls.md
index b21b8ce1fde..3a84b8be916 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/add-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/add-date-function-calls.md
@@ -12,7 +12,7 @@ The first parameter can be an attribute of a domain model entity of type **Date
 
 You can also subtract a time period from the specified date. For more information, see [Subtract Date Function Calls](/refguide/subtract-date-function-calls/).
 
-## addMilliseconds {#addMilliseconds}
+## `addMilliseconds` {#addMilliseconds}
 
 The `addMilliseconds` function adds a specified number of milliseconds to a date.
 
@@ -47,7 +47,7 @@ The output is:
 "Mon Jan 01 01:01:02:400 CET 2007"
 ```
 
-## addSeconds {#addSeconds}
+## `addSeconds` {#addSeconds}
 
 The `addSeconds` function adds a specified number of seconds to a date.
 
@@ -82,7 +82,7 @@ The output is:
 "Mon Jan 01 01:01:03 CET 2007"
 ```
 
-## addMinutes {#addMinutes}
+## `addMinutes` {#addMinutes}
 
 The `addMinutes` function adds a number of minutes to a date.
 
@@ -117,7 +117,7 @@ The output is:
 "Mon Jan 01 01:04:01 CET 2007"
 ```
 
-## addHours {#addHours}
+## `addHours` {#addHours}
 
 The `addHours` function adds a number of hours to a date.
 
@@ -152,7 +152,7 @@ The output is:
 "Mon Jan 02 02:01:01 CET 2007"
 ```
 
-## addDays[UTC] {#addDays}
+## `addDays[UTC]` {#addDays}
 
 The `addDaysUTC` function adds a number of days to a date. `addDays` uses the server's calendar and `addDaysUTC` uses the UTC calendar.
 
@@ -187,7 +187,7 @@ The output is:
 "Mon Jan 04 01:01:01 CET 2007"
 ```
 
-## addWeeks[UTC] {#addWeeks}
+## `addWeeks[UTC]` {#addWeeks}
 
 The `addWeeksUTC` function adds a number of weeks to a date using the UTC calendar as opposed to  `addWeeks` which uses the server's one. 
 
@@ -222,7 +222,7 @@ The output is:
 "Mon Jan 15 01:01:01 CET 2007"
 ```
 
-## addMonths[UTC] {#addMonths}
+## `addMonths[UTC]` {#addMonths}
 
 The `addMonthsUTC` function adds a number of months to a date using the UTC calendar as opposed to  `addMonths` which uses the server's one.
 
@@ -257,7 +257,7 @@ The output is:
 "Mon Feb 01 01:01:01 CET 2008"
 ```
 
-## addQuarters[UTC] {#addQuarters}
+## `addQuarters[UTC]` {#addQuarters}
 
 The `addQuartersUTC` function adds a number of quarters to a date using the UTC calendar as opposed to  `addQuarters` which uses the server's one.
 
@@ -292,7 +292,7 @@ The output is:
 Mon Apr 01 01:01:01 CET 2007
 ```
 
-## addYears[UTC] {#addYears}
+## `addYears[UTC]` {#addYears}
 
 The `addYearsUTC` function adds a number of years to a date using the UTC calendar as opposed to  `addYears` which uses the server's one.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/arithmetic-expressions.md b/content/en/docs/refguide/modeling/application-logic/expressions/arithmetic-expressions.md
index 2c269734e7b..40905e1d556 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/arithmetic-expressions.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/arithmetic-expressions.md
@@ -8,7 +8,7 @@ weight: 20
 
 This document describes the arithmetic operators which are supported in expressions. These all work on numeric data types (Integer/Long and Decimal).
 
-## Multiplication (*) {#multiplication}
+## Multiplication (`*`) {#multiplication}
 
 Multiplies two numbers.
 
@@ -41,7 +41,7 @@ The output is:
 6
 ```
 
-## Division (div or :) {#division}
+## Division (`div` or `:`) {#division}
 
 Divides two numbers. You can use either the `div` or colon ( `:` ) syntax, as can be seen below in the examples. The colon ( `:` ) syntax is inspired by the divide symbol `÷`. We cannot use the more conventional slash ( / ) syntax because that would conflict with the slash which is used for separating objects and members.
 
@@ -128,7 +128,7 @@ The result of a division is only an approximation if it has an infinite decimal
 
 Therefore, it is recommended to do division operations last.
 
-## Modulo (mod) {#modulo}
+## Modulo (`mod`) {#modulo}
 
 Calculates the remainder of the division of one number by another. In other words, `m` modulo `n` corresponds to: `m = p + k*n`, where `p` is the result of the operation `m` modulo `n`.
 
@@ -161,7 +161,7 @@ the output is:
 3
 ```
 
-## Addition (+) {#addition}
+## Addition (`+`) {#addition}
 
 Adds two numbers.
 
@@ -196,7 +196,7 @@ the output is:
 1
 ```
 
-## Subtraction (-) {#subtraction}
+## Subtraction (`-`) {#subtraction}
 
 Subtracts the second input from the first.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/begin-of-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/begin-of-date-function-calls.md
index 5329f060a26..fe5154d9c51 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/begin-of-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/begin-of-date-function-calls.md
@@ -13,7 +13,7 @@ The first parameter can be an attribute of an entity of type **Date and time**,
 
 You can also calculate the end of a time period from the specified date. For more information, see [End-of Date Function Calls](/refguide/end-of-date-function-calls/).
 
-## beginOfDay {#beginOfDay}
+## `beginOfDay` {#beginOfDay}
 
 The `beginOfDay` function calculates the beginning of the day compared to the initial date.
 
@@ -47,7 +47,7 @@ The output is:
 "Wed Feb 07 00:00 CET 2007"
 ```
 
-## beginOfWeek {#beginOfWeek}
+## `beginOfWeek` {#beginOfWeek}
 
 The `beginOfWeek` function calculates the beginning of the week compared to the initial date. The beginning and the end of the week are based on the user's locale. In the case of an anonymous user, the browser's locale is used instead.
 
@@ -81,7 +81,7 @@ The output is:
 "Sun Feb 04 00:00 CET 2007"
 ```
 
-## beginOfMonth {#beginOfMonth}
+## `beginOfMonth` {#beginOfMonth}
 
 The `beginOfMonth` function calculates the beginning of the month compared to the initial date.
 
@@ -115,7 +115,7 @@ The output is:
 "Thu Feb 01 00:00 CET 2007"
 ```
 
-## beginOfYear {#beginOfYear}
+## `beginOfYear` {#beginOfYear}
 
 The `beginOfYear` function calculates the beginning of the year compared to the initial date.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/between-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/between-date-function-calls.md
index 7bd8fe61c04..7b1a3b440d0 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/between-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/between-date-function-calls.md
@@ -8,7 +8,7 @@ weight: 100
 
 Between date function calls calculate the absolute difference between two dates. The difference will always be zero or a positive number.
 
-## millisecondsBetween {#millisecondsBetween}
+## `millisecondsBetween` {#millisecondsBetween}
 
 The `millisecondsBetween` function calculates the absolute difference between the input values in milliseconds.
 
@@ -43,7 +43,7 @@ The output is:
 2000
 ```
 
-## secondsBetween {#secondsBetween}
+## `secondsBetween` {#secondsBetween}
 
 The `secondsBetween` function calculates the absolute difference between the input values in seconds.
 
@@ -78,7 +78,7 @@ The output is:
 62
 ```
 
-## minutesBetween {#minutesBetween}
+## `minutesBetween` {#minutesBetween}
 
 The `minutesBetween` function calculates the absolute difference between the input values in minutes.
 
@@ -113,7 +113,7 @@ The output is:
 1
 ```
 
-## hoursBetween {#hoursBetween}
+## `hoursBetween` {#hoursBetween}
 
 The `hoursBetween` function calculates the absolute difference between the input values in hours.
 
@@ -148,7 +148,7 @@ The output is:
 2.5
 ```
 
-## daysBetween {#daysBetween}
+## `daysBetween` {#daysBetween}
 
 The `daysBetween` function calculates the absolute difference between the input values in days.
 
@@ -183,7 +183,7 @@ The output is:
 43
 ```
 
-## weeksBetween {#weeksBetween}
+## `weeksBetween` {#weeksBetween}
 
 The `weeksBetween` function calculates the absolute difference between the input values in weeks.
 
@@ -218,7 +218,7 @@ The output results in 8 days divided by 7 days in a week:
 1.1428571428571428
 ```
 
-## calendarMonthsBetween {#calendarMonthsBetween}
+## `calendarMonthsBetween` {#calendarMonthsBetween}
 
 The `calendarMonthsBetween` function calculates the absolute difference between the input values in months. Time will be ignored. The dates are assumed to be in the end-user's local time zone.
 
@@ -253,7 +253,7 @@ The output results in the amount of months between the two dates:
 7
 ```
 
-## calendarYearsBetween {#calendarYearsBetween}
+## `calendarYearsBetween` {#calendarYearsBetween}
 
 The `calendarYearsBetween` function calculates the absolute difference between the input values in years. Time will be ignored. The dates are assumed to be in the end-user's local time zone.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/boolean-expressions.md b/content/en/docs/refguide/modeling/application-logic/expressions/boolean-expressions.md
index 80a4258ba9f..f36fe94cbed 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/boolean-expressions.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/boolean-expressions.md
@@ -8,7 +8,7 @@ weight: 50
 
 Boolean expressions can be used to perform logical operations that return either true or false.
 
-## and {#and}
+## `and` {#and}
 
 The `and` operator checks two Boolean expressions and only returns `true` if both of the expressions are true.
 
@@ -32,7 +32,7 @@ The examples below illustrate which value the expression returns:
 
     The output is `false`, because only the second expression is `true`.
 
-## or {#or}
+## `or` {#or}
 
 The `or` operator combines two Boolean expressions, and returns `true` if at least one of the expressions is true.
 
@@ -58,7 +58,7 @@ The examples below illustrate which value the expression returns:
 
     The expression will return `false`, because both expressions are false.
 
-## not {#not}
+## `not` {#not}
 
 The `not` operator negates the specified Boolean expression.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/end-of-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/end-of-date-function-calls.md
index 626c41fe759..d8b07254798 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/end-of-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/end-of-date-function-calls.md
@@ -13,7 +13,7 @@ The first parameter can be an attribute of an entity of type **Date and time**,
 
 You can also calculate the end of a time period from the specified date. For more information, see [Begin-of Date Function Calls](/refguide/begin-of-date-function-calls/).
 
-## endOfDay {#endOfDay}
+## `endOfDay` {#endOfDay}
 
 The `endOfDay` function calculates the end of the day compared to the initial date.
 
@@ -45,7 +45,7 @@ The output is:
 "Wed Feb 07 23:59 CET 2007"
 ```
 
-## endOfWeek {#endOfWeek}
+## `endOfWeek` {#endOfWeek}
 
 The `endOfWeek` function calculates the end of the week compared to the initial date. The beginning and the end of the week are based on the user's locale. In the case of an anonymous user, the browser's locale is used instead.
 
@@ -77,7 +77,7 @@ The output is:
 "Sat Feb 10 23:59 CET 2007"
 ```
 
-## endOfMonth {#endOfMonth}
+## `endOfMonth` {#endOfMonth}
 
 The `endOfMonth` function calculates the end of the month compared to the initial date.
 
@@ -109,7 +109,7 @@ The output is:
 "Wed Feb 28 23:59 CET 2007"
 ```
 
-## endOfYear {#endOfYear}
+## `endOfYear` {#endOfYear}
 
 The `endOfYear` function calculates the end of the year compared to the initial date.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/enumerations-in-expressions.md b/content/en/docs/refguide/modeling/application-logic/expressions/enumerations-in-expressions.md
index 2f81672dd1e..f5f9ee88e30 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/enumerations-in-expressions.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/enumerations-in-expressions.md
@@ -34,7 +34,7 @@ else
   false
 ```
 
-## getCaption {#getCaption}
+## `getCaption` {#getCaption}
 
 The `getCaption` function takes an enumeration value and returns the caption of this value. The *caption* is a translatable string and the result of this function depends on the current language.
 
@@ -64,7 +64,7 @@ The output can be:
 Gouden
 ```
 
-## getKey {#getKey}
+## `getKey` {#getKey}
 
 The `getKey` function takes an enumeration value and returns the key (called *Name* in Studio Pro) of this value. The key is the technical name for the enumeration value and is language independent. For more information, see [Enumerations](/refguide/enumerations/).
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/length.md b/content/en/docs/refguide/modeling/application-logic/expressions/length.md
index 093fb4511fb..061d31974c7 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/length.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/length.md
@@ -8,7 +8,7 @@ weight: 135
 
 Basic function to determine the length of a string or a list.
 
-## length
+## `length`
 
 Determines the length of a string or a list and outputs the value as an integer.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/mathematical-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/mathematical-function-calls.md
index caf0a7cbe28..d5a8bc8a602 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/mathematical-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/mathematical-function-calls.md
@@ -10,7 +10,7 @@ Mathematical function calls include a limited number of mathematical operations
 
 If you need more elaborate functions (such as `sin`, `cos`, `tan`, `numberOfPermutations`, `factorial`, or `fibonacciNumber`), then consider using the community-supported [Math](https://marketplace.mendix.com/link/component/112522/) module available in the Mendix Marketplace.
 
-## max {#max}
+## `max` {#max}
 
 Returns the largest value from the specified arguments.
 
@@ -44,7 +44,7 @@ The output is a decimal:
 6.7
 ```
 
-## min {#min}
+## `min` {#min}
 
 Returns the smallest value from the specified arguments.
 
@@ -78,7 +78,7 @@ The output is a decimal:
 1
 ```
 
-## round {#round}
+## `round` {#round}
 
 Rounds a number to a certain precision.
 
@@ -126,7 +126,7 @@ The output is a decimal:
 88.72
 ```
 
-## random {#random}
+## `random` {#random}
 
 Generates a random number >= 0.0 and < 1.0
 
@@ -152,7 +152,7 @@ The output is:
 0.3
 ```
 
-## floor {#floor}
+## `floor` {#floor}
 
 Rounds down to an integer (returns the largest integer which is less than or equal to the input).
 
@@ -198,7 +198,7 @@ The output is:
 -2
 ```
 
-## ceil {#ceil}
+## `ceil` {#ceil}
 
 Rounds up to an integer (returns the smallest integer which is greater than or equal to the input).
 
@@ -244,7 +244,7 @@ The output is:
 -1
 ```
 
-## pow {#pow}
+## `pow` {#pow}
 
 Raises a number to a certain power.
 
@@ -295,7 +295,7 @@ The output is:
 Calculation of `pow` with a decimal power might be less accurate, as the standard Java/JavaScript libraries do not support these calculations with high precision. Use a specialized library in a custom Java/JavaScript action if high precision is required for this case.
 {{% /alert %}}
 
-## abs {#abs}
+## `abs` {#abs}
 
 Calculates the absolute value of a number (meaning, not negative).
 
@@ -335,7 +335,7 @@ The output in both cases is:
 5
 ```
 
-## sqrt {#sqrt}
+## `sqrt` {#sqrt}
 
 Calculates the square root of a number.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-date-function-calls.md
index 74ae1df8d3d..51b608608fe 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-date-function-calls.md
@@ -13,33 +13,33 @@ The following pattern letters can be used to parse and format Date and time valu
 
 | Letter | Date or Time Component                           | Examples                  |
 | ------ | ------------------------------------------------ | ------------------------- |
-| M      | Month in year, digit                             | 1                         |
-| MM     | Month in year, digit with leading zero           | 01                        |
-| MMM    | Month in year, abbreviated (context sensitive)   | Nov                       |
-| MMMM   | Month in year (context sensitive)                | November                  |
-| L      | Month in year, digit (standalone), digit         | 1                         |
-| LL     | Month in year, digit with leading zero           | 01                        |
-| LLL    | Month in year, abbreviated (standalone)          | Nov                       |
-| LLLL   | Month in year (standalone)                       | November                  |
-| yy     | Year, two digits                                 | 01                        |
-| yyyy   | Year, four digits                                | 2001                      |
-| G      | Era designator                                   | AD                        |
-| E      | Day name in week, abbreviated                    | Tue                       |
-| EEEE   | Day name in week                                 | Tuesday                   |
-| u      | Day of week (1 = Monday, ..., 7 = Sunday)        | 5                         |
-| w      | Week in year                                     | 11                        |
-| W      | Week in month                                    | 2                         |
-| D      | Day in year                                      | 133                       |
-| d      | Day in month                                     | 7                         |
-| F      | Day of week in month                             | 1                         |
-| a      | Am/pm marker                                     | PM                        |
-| H      | Hour in day (0-23)                               | 0                         |
-| k      | Hour in day (1-24)                               | 24                        |
-| K      | Hour in am/pm (0-11)                             | 0                         |
-| h      | Hour in am/pm (1-12)                             | 12                        |
-| m      | Minute in hour                                   | 24                        |
-| s      | Second in minute                                 | 50                        |
-| S      | Millisecond                                      | 201                       |
+| `M`      | Month in year, digit                             | 1                         |
+| `MM`     | Month in year, digit with leading zero           | 01                        |
+| `MMM`    | Month in year, abbreviated (context sensitive)   | Nov                       |
+| `MMMM`   | Month in year (context sensitive)                | November                  |
+| `L`      | Month in year, digit (standalone), digit         | 1                         |
+| `LL`     | Month in year, digit with leading zero           | 01                        |
+| `LLL`    | Month in year, abbreviated (standalone)          | Nov                       |
+| `LLLL`   | Month in year (standalone)                       | November                  |
+| `yy`     | Year, two digits                                 | 01                        |
+| `yyyy`   | Year, four digits                                | 2001                      |
+| `G`      | Era designator                                   | AD                        |
+| `E`      | Day name in week, abbreviated                    | Tue                       |
+| `EEEE`   | Day name in week                                 | Tuesday                   |
+| `u`      | Day of week (1 = Monday, ..., 7 = Sunday)        | 5                         |
+| `w`      | Week in year                                     | 11                        |
+| `W`      | Week in month                                    | 2                         |
+| `D`      | Day in year                                      | 133                       |
+| `d`      | Day in month                                     | 7                         |
+| `F`      | Day of week in month                             | 1                         |
+| `a`      | Am/pm marker                                     | PM                        |
+| `H`      | Hour in day (0-23)                               | 0                         |
+| `k`      | Hour in day (1-24)                               | 24                        |
+| `K`      | Hour in am/pm (0-11)                             | 0                         |
+| `h`      | Hour in am/pm (1-12)                             | 12                        |
+| `m`      | Minute in hour                                   | 24                        |
+| `s`      | Second in minute                                 | 50                        |
+| `S`      | Millisecond                                      | 201                       |
 
 {{% alert color="warning" %}}
 Prior to Mendix 11, the `MMM` and `MMMM` tokens were not properly supported in nanoflows for some languages.
@@ -64,15 +64,15 @@ The following pattern letters are only available for microflows:
 
 | Letter | Date or Time Component                    | Examples                              |
 | ------ | ----------------------------------------- | ------------------------------------- |
-| z      | Time zone                                 | Pacific Standard Time; PST; GMT-08:00 |
-| Z      | Time zone                                 | -0800                                 |
-| X      | Time zone                                 | -08; -0800; -08:00                    |
+| `z`      | Time zone                                 | Pacific Standard Time; PST; GMT-08:00 |
+| `Z`      | Time zone                                 | -0800                                 |
+| `X`      | Time zone                                 | -08; -0800; -08:00                    |
 
 {{% alert color="info" %}}
 For some parse and format functions, there are UTC variants. Do not use these UTC variants (for example, `parseDateTimeUTC`) in client-side expressions if you want to assign the output to (or compare the output with) an attribute of type **Date and time** where **Localize** is disabled. In the client, the localization functionality is built into the attribute type itself, and using UTC functions causes the time zone conversion to be handled twice.
 {{% /alert %}}
 
-## parseDateTime[UTC] {#parseDateTime}
+## `parseDateTime[UTC]` {#parseDateTime}
 
 Takes a string and parses it. If it fails and a default value is specified, it returns the default value. Otherwise, an error occurs. The function `parseDateTime` uses the user's time zone and `parseDateTimeUTC` uses the UTC calendar.
 
@@ -143,7 +143,7 @@ The examples below illustrate which value the expression returns:
     Mon Jan 01 00:00:00 CET 2007
     ```
 
-## formatDateTime[UTC] {#formatDateTime}
+## `formatDateTime[UTC]` {#formatDateTime}
 
 Converts the Date and time value to a string, formatted according to the format parameter. Without the format parameter, a standard format is used, which depends on the [Java version](/refguide/java-version-migration/#date-locale-dutch) and user locale. The function `formatDateTime` uses the users calendar and `formatDateTimeUTC` uses the UTC calendar.
 
@@ -184,7 +184,7 @@ To get a format like `'2008-06-08T10:12:01'`, you need to concatenate two format
 formatDateTime($object/Date1,'yyyy-MM-dd') + 'T' + formatDateTime($object/Date1,'HH:mm:ss')
 ```
 
-## formatTime[UTC] {#formatTime}
+## `formatTime[UTC]` {#formatTime}
 
 Converts the time part of Date and time value to a string in a standard format, which depends on the Java version and user locale. `formatTime` uses the users calendar and `formatTimeUTC` uses the UTC calendar.
 
@@ -218,7 +218,7 @@ the output is:
 '9:50 AM'
 ```
 
-## formatDate[UTC] {#formatDate}
+## `formatDate[UTC]` {#formatDate}
 
 Converts the date part of Date and time value to a string in a standard format, which depends on the [Java version](/refguide/java-version-migration/#date-locale-dutch) and user locale. `formatDate` uses the users calendar and `formatDateUTC` uses the UTC calendar.
 
@@ -252,7 +252,7 @@ the output is:
 '7/2/74'
 ```
 
-## dateTimeToEpoch {#dateTimeToEpoch}
+## `dateTimeToEpoch` {#dateTimeToEpoch}
 
 Returns the number of milliseconds since January 1, 1970, 00:00:00 GMT to the date.
 
@@ -286,7 +286,7 @@ The output is:
 141990610000
 ```
 
-## epochToDateTime {#epochToDateTime}
+## `epochToDateTime` {#epochToDateTime}
 
 Creates a Date and time that represents the specified number of milliseconds since January 1, 1970, 00:00:00 GMT.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-decimal-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-decimal-function-calls.md
index 35710ad5955..844e6bc241a 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-decimal-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/parse-and-format-decimal-function-calls.md
@@ -12,7 +12,7 @@ This document describes parsing and formatting decimal function calls. For detai
 In nanoflows, it is not possible to use parsing and formatting decimal function calls with optional format string (for example, `'#,###.##'`) within a text parameter on a page. The text parameter works the same way as a nanoflow and is restricted to only using the format appropriate to the locale from the language of the current user in Mendix apps.
 {{% /alert %}}
 
-## parseDecimal {#parseDecimal}
+## `parseDecimal` {#parseDecimal}
 
 Parses a string value to a decimal value according to a specified format.
 
@@ -65,7 +65,7 @@ The following example only applies to microflows, given that in nanoflows, you c
 
 * `parseDecimal('3,241.98', '#,###.##')` returns `3241.98`
 
-## formatDecimal {#formatDecimal}
+## `formatDecimal` {#formatDecimal}
 
 Converts a decimal value to a string value according to a specified format.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/parse-integer.md b/content/en/docs/refguide/modeling/application-logic/expressions/parse-integer.md
index b98c97d507b..cd53a7cf967 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/parse-integer.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/parse-integer.md
@@ -9,7 +9,7 @@ description: "Describes the function for parsing integer from strings in Mendix.
 
 This document describes the function that converts a string to a value that is of data type [Integer/Long](/refguide/data-types/#integer-long).
 
-## parseInteger
+## `parseInteger`
 
 Takes a string and parses it to an Integer/Long.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/relational-expressions.md b/content/en/docs/refguide/modeling/application-logic/expressions/relational-expressions.md
index af402343d95..7bf13585907 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/relational-expressions.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/relational-expressions.md
@@ -9,7 +9,7 @@ description: "Describes relational expressions in Mendix."
 
 Relational expressions allow users to compare values and to make changes and perform actions based upon that information. The return type of such expressions is always Boolean.
 
-## Less Than ( < ) {#less-than}
+## Less Than ( `<` ) {#less-than}
 
 This expression determines whether the first value is less than the second value.
 
@@ -49,7 +49,7 @@ the output is:
 False
 ```
 
-## Greater Than ( > ) {#greater-than}
+## Greater Than ( `>` ) {#greater-than}
 
 This expression determines whether the first value is greater than the second value.
 
@@ -92,7 +92,7 @@ the output is:
 True
 ```
 
-## Less Than or Equal To ( <= ) {#less-than-or-equal-to}
+## Less Than or Equal To ( `<=` ) {#less-than-or-equal-to}
 
 This expression determines whether the first value is less than or equal to the second value.
 
@@ -149,7 +149,7 @@ The examples below illustrate which value the expression returns:
     True
     ```
 
-## Greater Than or Equal To ( >= ) {#greater-than-or-equal-to}
+## Greater Than or Equal To ( `>=` ) {#greater-than-or-equal-to}
 
 Determines whether the first value is greater than or equal to the second.
 
@@ -192,7 +192,7 @@ the output is:
 True
 ```
 
-## Equal To ( = ) {#equal-to}
+## Equal To ( `=` ) {#equal-to}
 
 This expression determines whether the two values are equal.
 
@@ -250,7 +250,7 @@ The examples below illustrate which value the expression returns:
     True
     ```
 
-## Not Equal To ( != ) {#not-equal-to}
+## Not Equal To ( `!=` ) {#not-equal-to}
 
 Determines whether the two values are not equal.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/string-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/string-function-calls.md
index dc26cba8044..1027d94cda8 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/string-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/string-function-calls.md
@@ -16,7 +16,7 @@ For a great deep-dive look into string functions call, check out this video:
 
 {{< vidyard "EpVivdyB4i1jGvc8J9yXkt" >}}
 
-## toLowerCase {#toLowerCase}
+## `toLowerCase` {#toLowerCase}
 
 Converts all characters in the string to lowercase.
 
@@ -50,7 +50,7 @@ The output is the following:
 'thisismystring'
 ```
 
-## toUpperCase {#toUpperCase}
+## `toUpperCase` {#toUpperCase}
 
 Converts all characters in the string to uppercase.
 
@@ -84,7 +84,7 @@ The output is the following:
 'THISISMYSTRING'
 ```
 
-## substring {#substring}
+## `substring` {#substring}
 
 Retrieves a substring of a string. Note that the first character of a string is located at position `0`, and the last character is located at position `length(string)-1`.
 
@@ -145,7 +145,7 @@ To prevent the value of the third parameter from getting out of range, you can s
 substring('thisismystring', 0, min(length('thisismystring'), 20))
 ```
 
-## find {#find}
+## `find` {#find}
 
 Finds the position of the first occurrence of the substring in the string.
 
@@ -205,7 +205,7 @@ The output is:
 11
 ```
 
-## findLast {#findLast}
+## `findLast` {#findLast}
 
 Finds the position of the last occurrence of a substring in the original string.
 
@@ -267,7 +267,7 @@ The output is:
 
 As the optional parameter is `5`, the string gets searched up to (and including) position `5`, which means searching the substring `'thisis'`. The last instance of `'i'` in that substring is at position `4`.
 
-## contains {#contains}
+## `contains` {#contains}
 
 Determines whether the original string (first parameter) contains a substring (second parameter).
 
@@ -326,7 +326,7 @@ The output is:
 true
 ```
 
-## startsWith {#startWith}
+## `startsWith` {#startWith}
 
 Determines whether a string starts with the specified substring.
 
@@ -361,7 +361,7 @@ The output is:
 true
 ```
 
-## endsWith {#endWith}
+## `endsWith` {#endWith}
 
 Determines whether a string ends with the specified substring.
 
@@ -396,7 +396,7 @@ The output is:
 true
 ```
 
-## trim {#trim}
+## `trim` {#trim}
 
 Removes all the whitespace at the beginning and end of a string.
 
@@ -442,7 +442,7 @@ The output is:
 ''
 ```
 
-## isMatch {#isMatch}
+## `isMatch` {#isMatch}
 
 Checks to see if a string matches a given regular expression.
 
@@ -501,7 +501,7 @@ NB searching an empty string:
 
 * `isMatch('', '.*[0-9].*')` returns `false`
 
-## replaceAll {#replaceAll}
+## `replaceAll` {#replaceAll}
 
 Replaces all occurrences of a regular expression with another string.
 
@@ -562,7 +562,7 @@ And the output is that there are no matches for the input:
 'this is a string with no numbers thrown in'
 ```
 
-## replaceFirst {#replaceFirst}
+## `replaceFirst` {#replaceFirst}
 
 Replaces the first occurrence of the regular expression with a replacement string.
 
@@ -611,7 +611,7 @@ The output is:
 'this is a string with NUMBER5 some numbers 234 thrown in'
 ```
 
-## String Concatenation ( + ) {#string-concatenation}
+## String Concatenation ( `+` ) {#string-concatenation}
 
 The `+` operator can be used to concatenate two strings or a string and a number.
 
@@ -664,7 +664,7 @@ The output is:
 '4.73 kilometers'
 ```
 
-## urlEncode {#urlEncode}
+## `urlEncode` {#urlEncode}
 
 Converts a string to be used in a URL. This function is useful when you want to use the string as part of the URL.
 
@@ -704,7 +704,7 @@ The output is:
 'Hello%2C+world%21'
 ```
 
-## urlDecode {#urlDecode}
+## `urlDecode` {#urlDecode}
 
 Converts a string back from a URL. The opposite of [urlEncode](#urlEncode).
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/subtract-date-function-calls.md b/content/en/docs/refguide/modeling/application-logic/expressions/subtract-date-function-calls.md
index f2e2642ee8e..19189f82134 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/subtract-date-function-calls.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/subtract-date-function-calls.md
@@ -12,7 +12,7 @@ The first parameter can be an attribute of a domain model entity of type **Date
 
 You can also add a time period to the specified date. For more information, see [Add Date Function Calls](/refguide/add-date-function-calls/).
 
-## subtractMilliseconds {#subtractMilliseconds}
+## `subtractMilliseconds` {#subtractMilliseconds}
 
 The `subtractMilliseconds` function subtracts a specified number of milliseconds from a date.
 
@@ -47,7 +47,7 @@ The output is:
 Mon Jan 01 01:01:00 CET 2007
 ```
 
-## subtractSeconds {#subtractSeconds}
+## `subtractSeconds` {#subtractSeconds}
 
 The `subtractSeconds` function subtracts a specified number of seconds from a date.
 
@@ -82,7 +82,7 @@ The output is:
 Mon Jan 01 01:00:30 CET 2007
 ```
 
-## subtractMinutes {#subtractMinutes}
+## `subtractMinutes` {#subtractMinutes}
 
 The `subtractMinutes` function subtracts a number of minutes from a date.
 
@@ -117,7 +117,7 @@ The output is:
 Mon Jan 01 00:30:01 CET 2007
 ```
 
-## subtractHours {#subtractHours}
+## `subtractHours` {#subtractHours}
 
 The `subtractHours` function subtracts a number of hours from a date.
 
@@ -152,7 +152,7 @@ The output is:
 Mon Jan 01 00:01:01 CET 2007
 ```
 
-## subtractDays[UTC] {#subtractDays}
+## `subtractDays[UTC]` {#subtractDays}
 
 The `subtractDaysUTC` function subtracts a number of days from a date. `subtractDays` uses the server's calendar and `subtractDaysUTC` uses the UTC calendar.
 
@@ -187,7 +187,7 @@ The output is:
 Mon Jan 01 01:01:01 CET 2007
 ```
 
-## subtractWeeks[UTC] {#subtractWeeks}
+## `subtractWeeks[UTC]` {#subtractWeeks}
 
 The `subtractWeeksUTC` function subtracts a number of weeks from a date using the UTC calendar as opposed to  `subtractWeeks` which uses the server's one. 
 
@@ -222,7 +222,7 @@ The output is:
 Mon Jan 01 01:01:01 CET 2007
 ```
 
-## subtractMonths[UTC] {#subtractMonths}
+## `subtractMonths[UTC]` {#subtractMonths}
 
 The `subtractMonthsUTC` function subtracts a number of months from a date using the UTC calendar as opposed to  `subtractMonths` which uses the server's one.
 
@@ -257,7 +257,7 @@ The output is:
 Mon Jan 01 01:01:01 CET 2007
 ```
 
-## subtractQuarters[UTC] {#subtractQuarters}
+## `subtractQuarters[UTC]` {#subtractQuarters}
 
 The `subtractQuartersUTC` function subtracts a number of quarters from a date using the UTC calendar as opposed to  `subtractQuarters` which uses the server's one.
 
@@ -292,7 +292,7 @@ The output is:
 Mon Jan 01 01:01:01 CET 2007
 ```
 
-## subtractYears[UTC] {#subtractYears}
+## `subtractYears[UTC]` {#subtractYears}
 
 The `subtractYearsUTC` function subtracts a number of years from a date using the UTC calendar as opposed to  `subtractYears` which uses the server's one.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/to-string.md b/content/en/docs/refguide/modeling/application-logic/expressions/to-string.md
index 752aedf4462..91c1628e961 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/to-string.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/to-string.md
@@ -8,7 +8,7 @@ weight: 130
 
 Basic functions to convert values of various data types to string.
 
-## toString
+## `toString`
 
 Converts the specified value to a string representation.
 
diff --git a/content/en/docs/refguide/modeling/application-logic/expressions/trim-to-date.md b/content/en/docs/refguide/modeling/application-logic/expressions/trim-to-date.md
index 8daa4bc76b6..464a5af1af2 100644
--- a/content/en/docs/refguide/modeling/application-logic/expressions/trim-to-date.md
+++ b/content/en/docs/refguide/modeling/application-logic/expressions/trim-to-date.md
@@ -8,7 +8,7 @@ weight: 120
 
 These are functions to round off dates to different time units.
 
-## trimToSeconds {#trimToSeconds}
+## `trimToSeconds` {#trimToSeconds}
 
 This function is used to trim the date to seconds, rounding off all milliseconds to zero.
 
@@ -42,7 +42,7 @@ The output is:
 'Sun Jun 08 10:12:51 CEST 2008'
 ```
 
-## trimToMinutes {#trimToMinutes}
+## `trimToMinutes` {#trimToMinutes}
 
 This function is used to trim the date to minutes, rounding off all (milli)seconds to zero.
 
@@ -76,7 +76,7 @@ The output is:
 'Sun Jun 08 10:12:00 CEST 2008'
 ```
 
-## trimToHours[UTC] {#trimToHours}
+## `trimToHours[UTC]` {#trimToHours}
 
 This function is used to trim the date to hours, rounding off all minutes to zero.
 
@@ -112,7 +112,7 @@ The output is:
 'Sun Jun 08 10:00:00 CEST 2008'
 ```
 
-## trimToDays[UTC] {#trimToDays}
+## `trimToDays[UTC]` {#trimToDays}
 
 This function is used to trim the date to days, rounding off all hours to zero.
 
@@ -148,7 +148,7 @@ The output is:
 'Sun Jun 08 00:00:00 CEST 2008'
 ```
 
-## trimToMonths[UTC] {#trimToMonths}
+## `trimToMonths[UTC]` {#trimToMonths}
 
 This function is used to trim the date to months, rounding off all days to zero.
 
@@ -184,7 +184,7 @@ The output is:
 'Sun Jun 01 00:00:00 CEST 2008'
 ```
 
-## trimToYears[UTC] {#trimToYears}
+## `trimToYears[UTC]` {#trimToYears}
 
 This function is used to trim the date to years, rounding off all months and days to zero.