diff --git a/collection/Sterling Vermin Adventuring Co.; The Ultimate Adventurer's Handbook.json b/collection/Sterling Vermin Adventuring Co.; The Ultimate Adventurer's Handbook.json
index 86d46b559..27fb8da34 100755
--- a/collection/Sterling Vermin Adventuring Co.; The Ultimate Adventurer's Handbook.json	
+++ b/collection/Sterling Vermin Adventuring Co.; The Ultimate Adventurer's Handbook.json	
@@ -37,7 +37,7 @@
 			]
 		},
 		"optionalFeatureTypes": {
-			"BC": "Battle Cries",
+			"BattleCry": "Battle Cries",
 			"Mal": "Malediction Metamorphosis",
 			"MagMod": "Magical Module",
 			"Mime": "Pantomime Tricks",
@@ -2656,7 +2656,7 @@
 					"type": "inset",
 					"name": "Exceeding Constitution Explained",
 					"entries": [
-						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points|PHB|3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
+						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points||3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
 					]
 				},
 				{
@@ -2754,7 +2754,7 @@
 					"type": "inset",
 					"name": "Exceeding Constitution Explained",
 					"entries": [
-						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points|PHB|3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
+						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points||3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
 					]
 				},
 				{
@@ -2860,7 +2860,7 @@
 					"type": "inset",
 					"name": "Exceeding Constitution Explained",
 					"entries": [
-						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points|PHB|3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
+						"When your Constitution is temporarily increased by your Exceeding Constitution, your hit point maximum increases by an amount equal to your level times the increase to your Constitution modifier caused by the increase to your Constitution score, and you gain a number of {@quickref temporary hit points||3|0} equal to twice your level. You lose all temporary hit points gained this way after 1 minute."
 					]
 				},
 				{
@@ -3334,7 +3334,7 @@
 					"type": "entries",
 					"name": "Scaley Hide",
 					"entries": [
-						"Whenever you finish a {@quickref resting|phb|2|0|short or long rest}, you gain {@quickref temporary hit points|PHB|3|0} equal to your Constitution modifier (minimum 1)."
+						"Whenever you finish a {@quickref resting|phb|2|0|short or long rest}, you gain {@quickref temporary hit points||3|0} equal to your Constitution modifier (minimum 1)."
 					]
 				}
 			]
@@ -4606,7 +4606,7 @@
 					"type": "entries",
 					"name": "Brace Up",
 					"entries": [
-						"You can use a bonus action and spend 1 moxie point to brace for attacks. You gain a number of {@quickref temporary hit points|PHB|3|0} equal to a roll of your fisticuffs die + your pugilist level + your Constitution modifier. You lose any remaining temporary hit points gained in this way after 1 minute."
+						"You can use a bonus action and spend 1 moxie point to brace for attacks. You gain a number of {@quickref temporary hit points||3|0} equal to a roll of your fisticuffs die + your pugilist level + your Constitution modifier. You lose any remaining temporary hit points gained in this way after 1 minute."
 					]
 				},
 				{
@@ -4620,7 +4620,7 @@
 					"type": "entries",
 					"name": "Stick and Move",
 					"entries": [
-						"You can use a bonus action and expend 1 moxie point to attempt to {@action shove} a creature or take the {@action Dash} action."
+						"You can use a bonus action and expend 1 moxie point to attempt to {@action shove} a creature or take the {@action Dash|PHB} action."
 					]
 				}
 			]
@@ -4644,7 +4644,7 @@
 			"classSource": "UltimateAdventurer",
 			"level": 3,
 			"entries": [
-				"Starting at 3rd level, when you take damage that reduces you to half your maximum hit points or less, you can use your reaction to gain {@quickref temporary hit points|PHB|3|0} equal to three times your pugilist level and regain all your expended moxie points. Once you use this feature, you can't use it again until you finish a {@quickref resting|phb|2|0|short or long rest}."
+				"Starting at 3rd level, when you take damage that reduces you to half your maximum hit points or less, you can use your reaction to gain {@quickref temporary hit points||3|0} equal to three times your pugilist level and regain all your expended moxie points. Once you use this feature, you can't use it again until you finish a {@quickref resting|phb|2|0|short or long rest}."
 			]
 		},
 		{
@@ -5367,7 +5367,7 @@
 				{
 					"name": "Battle Cries",
 					"featureType": [
-						"BC"
+						"BattleCry"
 					],
 					"progression": {
 						"3": 2,
@@ -11163,9 +11163,9 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"At 3rd level, you learn to bolster the resolve of your allies, and crush that of your enemies, with battle cries. You learn two {@filter battle cries|optionalfeatures|source=|feature type=BC} of your choice, which are detailed under Battle Cries below. You learn an additional battle cry of your choice at 6th, 10th, and 14th level. Each time you gain a barbarian level, you can replace one battle cry you know with a different one.",
+				"At 3rd level, you learn to bolster the resolve of your allies, and crush that of your enemies, with battle cries. You learn two {@filter battle cries|optionalfeatures|source=|feature type=BattleCry} of your choice, which are detailed under Battle Cries below. You learn an additional battle cry of your choice at 6th, 10th, and 14th level. Each time you gain a barbarian level, you can replace one battle cry you know with a different one.",
                 "You can issue one of your battle cries as an action on your turn. When you do, you choose a creature other than yourself within 30 feet of you that can hear you as the target for the battle cry. That target gains the effect of the chosen battle cry.",
-                "As part of the bonus action you use to enter a rage or as a bonus action while {@classFeature Rage|Barbarian|PHB|1|raging}, you can issue a battle cry.",
+                "As part of the bonus action you use to enter a rage or as a bonus action while {@classFeature Rage|Barbarian||1||raging}, you can issue a battle cry.",
 				"The battle cries are presented in alphabetical order.",
 				{
 					"type": "options",
@@ -11241,7 +11241,7 @@
 			"level": 6,
 			"header": 2,
 			"entries": [
-				"At 6th level, you augment your rage with a tribal song or chant that inspires greater power in your allies' attacks. While {@classFeature Rage|Barbarian|PHB|1|raging}, when a friendly creature other than you within 30 feet of you hits with an attack, the attack gains a bonus to its damage roll equal to half your rage damage bonus. A creature must be able to hear you to gain the benefits of this feature."
+				"At 6th level, you augment your rage with a tribal song or chant that inspires greater power in your allies' attacks. While {@classFeature Rage|Barbarian||1||raging}, when a friendly creature other than you within 30 feet of you hits with an attack, the attack gains a bonus to its damage roll equal to half your rage damage bonus. A creature must be able to hear you to gain the benefits of this feature."
 			]
 		},
 		{
@@ -11271,7 +11271,7 @@
 			"header": 2,
 			"entries": [
 				"Starting at 14th level, your voice booms with such incredible authority that even those who cannot hear it are compelled to listen. If a creature is {@condition deafened}, it can still hear you when you speak, as well as when you make any noise, for the purpose of your Path of the War Chief features.",
-                "Additionally, the range of your {@subclassFeature War Song|Barbarian||War Chief|UltimateAdventurer|6} increases to 60 feet, and when you issue a {@subclassFeature Tribal Leader|Barbarian||War Chief|UltimateAdventurer|3|battle cry}, you can choose a creature within 60 feet that can hear you as the target for the battle cry's effects."
+                "Additionally, the range of your {@subclassFeature War Song|Barbarian||War Chief|UltimateAdventurer|6} increases to 60 feet, and when you issue a {@subclassFeature Tribal Leader|Barbarian||War Chief|UltimateAdventurer|3||battle cry}, you can choose a creature within 60 feet that can hear you as the target for the battle cry's effects."
 			]
 		},
         {
@@ -11306,7 +11306,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"Starting when you choose this path at 3rd level, your {@classFeature Rage|Barbarian|PHB|1|rage} becomes fueled with the momentous force of a wild stampede. While raging, if you move at least 10 feet towards a creature before hitting it with a melee weapon attack, you can attempt to {@action shove} the creature as part of the same action. If the shove is successful, the creature takes {@damage 1d6} thunder damage. You can only use this feature once per turn."
+				"Starting when you choose this path at 3rd level, your {@classFeature Rage|Barbarian||1||rage} becomes fueled with the momentous force of a wild stampede. While raging, if you move at least 10 feet towards a creature before hitting it with a melee weapon attack, you can attempt to {@action shove} the creature as part of the same action. If the shove is successful, the creature takes {@damage 1d6} thunder damage. You can only use this feature once per turn."
 			]
 		},
         {
@@ -11334,7 +11334,7 @@
 			"level": 6,
 			"header": 2,
 			"entries": [
-				"Starting at 6th level, the energy in your movement inspires your allies to new heights of their own speed. While {@classFeature Rage|Barbarian|PHB|1|raging}, your speed increases by 10-foot, and at the start of each of your turns, you can choose a number of other willing creatures you can see within 30 feet of you equal to your Constitution modifier (minimum of one creature). Those creatures gain a 10 feet bonus to their speed until the start of your next turn."
+				"Starting at 6th level, the energy in your movement inspires your allies to new heights of their own speed. While {@classFeature Rage|Barbarian||1||raging}, your speed increases by 10-foot, and at the start of each of your turns, you can choose a number of other willing creatures you can see within 30 feet of you equal to your Constitution modifier (minimum of one creature). Those creatures gain a 10 feet bonus to their speed until the start of your next turn."
 			]
 		},
 		{
@@ -11362,7 +11362,7 @@
 			"level": 14,
 			"header": 2,
 			"entries": [
-				"At 14th level, your ferocity whips your allies up into a frenzied stampede, trampling anyone in your paths. When you enter a {@classFeature Rage|Barbarian|PHB|1|rage}, you can let loose a mighty roar, inspiring up to 10 creatures of your choice that can hear you into action. When you do, each chosen creature can use its reaction to move up to its movement speed and attempt to {@action shove} a creature within its reach.",
+				"At 14th level, your ferocity whips your allies up into a frenzied stampede, trampling anyone in your paths. When you enter a {@classFeature Rage|Barbarian||1||rage}, you can let loose a mighty roar, inspiring up to 10 creatures of your choice that can hear you into action. When you do, each chosen creature can use its reaction to move up to its movement speed and attempt to {@action shove} a creature within its reach.",
                 "Once you use this feature, you can't use it again until you finish a {@quickref resting|phb|2|0|short or long rest}."
 			]
 		},
@@ -11376,7 +11376,7 @@
 			"subclassSource": "UltimateAdventurer",
 			"level": 3,
 			"entries": [
-				"You belong to an ancient line of barbarians who practice sacred hunts and rituals to adopt the shape of beasts. When you begin this path, you incorporate elements of the beasts you have hunted into your physical form when you {@classFeature Rage|Barbarian|PHB|1|rage}. As you continue on the path, you learn to slip from your skin to that of a beast and grow to the size of nature's fiercest predators when you rage.",
+				"You belong to an ancient line of barbarians who practice sacred hunts and rituals to adopt the shape of beasts. When you begin this path, you incorporate elements of the beasts you have hunted into your physical form when you {@classFeature Rage|Barbarian||1||rage}. As you continue on the path, you learn to slip from your skin to that of a beast and grow to the size of nature's fiercest predators when you rage.",
 				{
 					"type": "refSubclassFeature",
 					"subclassFeature": "Sacred Hunt|Barbarian||Skinchanger|UltimateAdventurer|3"
@@ -11398,7 +11398,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"When you choose this path at 3rd level, you learn a sacred hunting ritual that allows you to gain the abilities of beasts. With 1 hour of heavy activity, you can perform this ritual, choosing a natural weapon and your choice of two of the following benefits. Once the ritual is completed, you gain that natural weapon and those benefits while {@classFeature Rage|Barbarian|PHB|1|raging}. When you perform this ritual again, you lose all benefits selected from your previous use of this feature.",
+				"When you choose this path at 3rd level, you learn a sacred hunting ritual that allows you to gain the abilities of beasts. With 1 hour of heavy activity, you can perform this ritual, choosing a natural weapon and your choice of two of the following benefits. Once the ritual is completed, you gain that natural weapon and those benefits while {@classFeature Rage|Barbarian||1||raging}. When you perform this ritual again, you lose all benefits selected from your previous use of this feature.",
                 {
 					"type": "entries",
 					"name": "Natural Weapon",
@@ -11484,7 +11484,7 @@
 			"level": 10,
 			"header": 2,
 			"entries": [
-				"At 10th level, when you enter a {@classFeature Rage|Barbarian|PHB|1|rage}, you can choose to swell with primal fury. If you do, for the duration of your rage, your size increases by one category — from Medium to Large, for example. While your size is increased by this feature, your melee weapon attacks deal an additional {@damage 1d4} damage. Any equipment you are wearing changes to accommodate your new size."
+				"At 10th level, when you enter a {@classFeature Rage|Barbarian||1||rage}, you can choose to swell with primal fury. If you do, for the duration of your rage, your size increases by one category — from Medium to Large, for example. While your size is increased by this feature, your melee weapon attacks deal an additional {@damage 1d4} damage. Any equipment you are wearing changes to accommodate your new size."
 			]
 		},
 		{
@@ -11554,7 +11554,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"Also at 3rd level, when you use your {@classFeature Reckless Attack|Barbarian|PHB|2} feature while {@classFeature Rage|Barbarian|PHB|1|raging}, you can choose to bleed yourself to enhance your attacks. You lose hit points equal to your Constitution modifier (minimum 1), and each weapon attack you make on this turn deals extra damage equal to 1 + your Constitution modifier."
+				"Also at 3rd level, when you use your {@classFeature Reckless Attack|Barbarian||2} feature while {@classFeature Rage|Barbarian||1||raging}, you can choose to bleed yourself to enhance your attacks. You lose hit points equal to your Constitution modifier (minimum 1), and each weapon attack you make on this turn deals extra damage equal to 1 + your Constitution modifier."
 			]
 		},
 		{
@@ -11624,7 +11624,7 @@
 					"type": "entries",
 					"name": "Dragon",
 					"entries": [
-						"You can cast the {@spell speak with animals} and {@spell dragon's breath|XGE} spells at will, as if you had used a 5th level spell slot. You can cast and {@condition concentration|PHB|concentrate} on these spells even while {@classFeature Rage|Barbarian|PHB|1|raging}."
+						"You can cast the {@spell speak with animals} and {@spell dragon's breath|XGE} spells at will, as if you had used a 5th level spell slot. You can cast and {@condition concentration|PHB|concentrate} on these spells even while {@classFeature Rage|Barbarian||1||raging}."
 					]
 				},
                 {
@@ -12924,7 +12924,7 @@
 							"type": "item",
 							"name": "Soulbound",
 							"entries": [
-								"When a creature uses a {@classFeature Bardic Inspiration|Bard||1} die you gave it, the familiar regains hit points equal to the result of the Bardic Inspiration die roll. If this healing would restore the familiar above its hit point maximum, it gains {@quickref temporary hit points|PHB|3|0} equal to the surplus."
+								"When a creature uses a {@classFeature Bardic Inspiration|Bard||1} die you gave it, the familiar regains hit points equal to the result of the Bardic Inspiration die roll. If this healing would restore the familiar above its hit point maximum, it gains {@quickref temporary hit points||3|0} equal to the surplus."
 							]
 						}
 					]
@@ -12994,7 +12994,7 @@
 					"type": "entries",
 					"name": "Channel Divinity: Celestial Song",
 					"entries": [
-						"As an action, you sing a song of worship for the divine that empowers your allies and enfeebles certain outsiders. Choose any number of creatures within 30 feet who can hear you to gain {@quickref temporary hit points|PHB|3|0} equal to {@dice 1d6} + your Charisma modifier. Fiends and undead can't be chosen and, instead, must succeed on a Constitution saving throw or take radiant damage equal to {@damage 1d6} + your Charisma modifier. For the next minute, you can use a bonus action on each of your turns to repeat this effect. If you end a turn without repeating the effect, your Celestial Song ends.",
+						"As an action, you sing a song of worship for the divine that empowers your allies and enfeebles certain outsiders. Choose any number of creatures within 30 feet who can hear you to gain {@quickref temporary hit points||3|0} equal to {@dice 1d6} + your Charisma modifier. Fiends and undead can't be chosen and, instead, must succeed on a Constitution saving throw or take radiant damage equal to {@damage 1d6} + your Charisma modifier. For the next minute, you can use a bonus action on each of your turns to repeat this effect. If you end a turn without repeating the effect, your Celestial Song ends.",
 						"Any remaining temporary hit points granted by this ability are lost when your Celestial Song ends."
 					]
 				}
@@ -13212,7 +13212,7 @@
 				"amount": 1
 			},
 			"entries": [
-				"Starting at 3rd level, you impart your affinity for risky wagers to your compatriots when you inspire them. After a creature you inspired rolls a {@classFeature Bardic Inspiration|Bard||1} die, it can choose to roll an additional die of the same type (a {@dice d6} if your Bardic Inspiration die is a {@dice d6}, for example). If the additional die result is lower than the Bardic Inspiration die, the roll loses the benefit of the Bardic Inspiration die. If the additional die result is equal to or higher than the Bardic Inspiration die, add the result of both dice to the roll and the creature gains {@quickref temporary hit points|PHB|3|0} equal to the total of both dice. In either case, the Bardic Inspiration die is lost."
+				"Starting at 3rd level, you impart your affinity for risky wagers to your compatriots when you inspire them. After a creature you inspired rolls a {@classFeature Bardic Inspiration|Bard||1} die, it can choose to roll an additional die of the same type (a {@dice d6} if your Bardic Inspiration die is a {@dice d6}, for example). If the additional die result is lower than the Bardic Inspiration die, the roll loses the benefit of the Bardic Inspiration die. If the additional die result is equal to or higher than the Bardic Inspiration die, add the result of both dice to the roll and the creature gains {@quickref temporary hit points||3|0} equal to the total of both dice. In either case, the Bardic Inspiration die is lost."
 			]
 		},
 		{
@@ -13455,7 +13455,7 @@
 			"level": 6,
 			"header": 2,
 			"entries": [
-				"Starting at 6th level, while a creature who is not immune to being charmed has its movement speed reduced to 0 by your {@creature animated marionette|UltimateAdventurer}’s tangled thread, you can use a bonus action on your turn to command the creature to take one of the actions in its stat block or the {@action Dash} or {@action Help} action. When you do, the reduced movement speed condition ends and the creature immediately uses its reaction to take the commanded action targeting a creature or creatures of your choice if applicable."
+				"Starting at 6th level, while a creature who is not immune to being charmed has its movement speed reduced to 0 by your {@creature animated marionette|UltimateAdventurer}’s tangled thread, you can use a bonus action on your turn to command the creature to take one of the actions in its stat block or the {@action Dash|PHB} or {@action Help} action. When you do, the reduced movement speed condition ends and the creature immediately uses its reaction to take the commanded action targeting a creature or creatures of your choice if applicable."
 			]
 		},
 		{
@@ -13521,14 +13521,14 @@
 							"type": "item",
 							"name": "Patient Defense",
 							"entries": [
-								"When you use dim ki to activate this feature, you also roll your {@classFeature Martial Arts|Monk||1} die and gain that many {@quickref temporary hit points|PHB|3|0}. You lose any remaining temporary hit points granted by this feature after 1 minute."
+								"When you use dim ki to activate this feature, you also roll your {@classFeature Martial Arts|Monk||1} die and gain that many {@quickref temporary hit points||3|0}. You lose any remaining temporary hit points granted by this feature after 1 minute."
 							]
 						},
 						{
 							"type": "item",
 							"name": "Step of the Wind",
 							"entries": [
-								"When you use bright ki to activate this feature, you can use a bonus action to take the {@action Disengage} and {@action Dash} action instead of having to choose just one."
+								"When you use bright ki to activate this feature, you can use a bonus action to take the {@action Disengage} and {@action Dash|PHB} action instead of having to choose just one."
 							]
 						}
 					]
@@ -13834,7 +13834,7 @@
 					"items": [
 						"You can spend 2 ki points to cast {@spell calm emotions}. Wisdom is your spellcasting ability for the spell.",
 						"When you hit a creature with a melee attack using a {@classFeature Martial Arts|Monk||1||monk weapon} or an unarmed strike, you can spend 1 ki point to attempt to disarm the target. The target must succeed on a Strength saving throw or drop an object of your choice that it's holding.",
-						"When you end your turn in combat without having dealt damage to a creature, you can spend 1 ki point to gain {@quickref temporary hit points|PHB|3|0} equal to your monk level."
+						"When you end your turn in combat without having dealt damage to a creature, you can spend 1 ki point to gain {@quickref temporary hit points||3|0} equal to your monk level."
 					]
 				},
 				"Additionally, when you hit a creature with a monk weapon or unarmed strike, you can choose to have the attack deal no damage, but still apply the attack's other effects."
@@ -14244,7 +14244,7 @@
 					"type": "entries",
 					"name": "Light",
 					"entries": [
-						"You embrace the path of logic, training yourself to suppress strong emotions and draw power from tranquility. You specialize in disciplines that aim to avoid conflict, but that bolster your allies if you must engage in violence. You learn the {@spell guidance} cantrip. Wisdom is your spellcasting ability for it, and when you cast {@spell guidance}, you can roll your Martial Arts die and gain that many {@quickref temporary hit points|PHB|3|0}."
+						"You embrace the path of logic, training yourself to suppress strong emotions and draw power from tranquility. You specialize in disciplines that aim to avoid conflict, but that bolster your allies if you must engage in violence. You learn the {@spell guidance} cantrip. Wisdom is your spellcasting ability for it, and when you cast {@spell guidance}, you can roll your Martial Arts die and gain that many {@quickref temporary hit points||3|0}."
 					]
 				}
 			]
@@ -14562,7 +14562,7 @@
 				"amount": 2
 			},	
 			"entries": [
-				"Starting at 6th level, you can harness the natural world to impede your foes and aid your allies. You can spend 2 ki points to cast the {@spell spike growth} spell, without material components. When you do so, you can choose any number of creatures that you can see. Chosen creatures do not take damage from the spell and ignore the {@quickref difficult terrain|PHB|4} it creates. When a chosen creature starts its turn in the spell's area, it gains {@dice 2d4} {@quickref temporary hit points|PHB|3|0}. Chosen creatures lose any temporary hit points granted in this way when the spell ends."
+				"Starting at 6th level, you can harness the natural world to impede your foes and aid your allies. You can spend 2 ki points to cast the {@spell spike growth} spell, without material components. When you do so, you can choose any number of creatures that you can see. Chosen creatures do not take damage from the spell and ignore the {@quickref difficult terrain|PHB|4} it creates. When a chosen creature starts its turn in the spell's area, it gains {@dice 2d4} {@quickref temporary hit points||3|0}. Chosen creatures lose any temporary hit points granted in this way when the spell ends."
 			]
 		},
 		{
@@ -14832,7 +14832,7 @@
 							"type": "item",
 							"name": "Scintillating",
 							"entries": [
-								"You exhale a burst of brilliant radiance. Each creature in the area must succeed on a Constitution saving throw or take radiant damage equal to two rolls of your hemocraft die + half your blood hunter level. You then gain {@quickref temporary hit points|PHB|3|0} equal to half the damage roll."
+								"You exhale a burst of brilliant radiance. Each creature in the area must succeed on a Constitution saving throw or take radiant damage equal to two rolls of your hemocraft die + half your blood hunter level. You then gain {@quickref temporary hit points||3|0} equal to half the damage roll."
 							]
 						},
 						{
@@ -15150,7 +15150,7 @@
 			"level": 18,
 			"header": 2,
 			"entries": [
-				"Starting at 18th level, when you cast the {@spell enlarge/reduce} spell using your {@subclassFeature Ordning Interloper|Blood Hunter|BH2022|Giantfeller|UltimateAdventurer|3} feature, your size increases by two categories instead of one (from Medium to Huge, for example), the extra damage granted by the spell increases from a {@dice 1d4} to a {@dice 1d8}, and you gain {@quickref temporary hit points|PHB|3|0} equal to twice your blood hunter level. You lose any remaining temporary hit points after 10 minutes."
+				"Starting at 18th level, when you cast the {@spell enlarge/reduce} spell using your {@subclassFeature Ordning Interloper|Blood Hunter|BH2022|Giantfeller|UltimateAdventurer|3} feature, your size increases by two categories instead of one (from Medium to Huge, for example), the extra damage granted by the spell increases from a {@dice 1d4} to a {@dice 1d8}, and you gain {@quickref temporary hit points||3|0} equal to twice your blood hunter level. You lose any remaining temporary hit points after 10 minutes."
 			]
 		},
 		{
@@ -15395,7 +15395,7 @@
 			"level": 11,
 			"header": 2,
 			"entries": [
-				"Starting at 11th level, your base walking speed increases by 10 feet, your jump distances are doubled, and you can use a bonus action on each of your turns to take the {@action Dash} action."
+				"Starting at 11th level, your base walking speed increases by 10 feet, your jump distances are doubled, and you can use a bonus action on each of your turns to take the {@action Dash|PHB} action."
 			]
 		},
 		{
@@ -15599,7 +15599,7 @@
 							"type": "item",
 							"name": "Brace Up",
 							"entries": [
-								"When you gain {@quickref temporary hit points|PHB|3|0} as a result of using your Brace Up moxie ability, your hound gains the same number of temporary hit points."
+								"When you gain {@quickref temporary hit points||3|0} as a result of using your Brace Up moxie ability, your hound gains the same number of temporary hit points."
 							]
 						},
 						{
@@ -15613,7 +15613,7 @@
 							"type": "item",
 							"name": "Stick and Move",
 							"entries": [
-								"When you use your Stick and Move moxie ability, your hound can take the {@action Dash} action."
+								"When you use your Stick and Move moxie ability, your hound can take the {@action Dash|PHB} action."
 							]
 						}
 					]
@@ -15663,7 +15663,7 @@
 				"amount": 1
 			},	
 			"entries": [
-				"Beginning at 17th level, your hound's spirit is as unbreakable as yours. When your hound takes damage that reduces its current hit points to half its maximum hit points or less, you can use your reaction to let your hound off the chain. When you do, it immediately gains {@quickref temporary hit points|PHB|3|0} equal to four times your pugilist level and, for the next minute, its speed increases by 15 feet and it can take the bite or {@action Dodge} action (your choice) each turn you don't command it. Once you use this feature, you can't use it again until you finish a {@quickref resting|phb|2|0|long rest}."
+				"Beginning at 17th level, your hound's spirit is as unbreakable as yours. When your hound takes damage that reduces its current hit points to half its maximum hit points or less, you can use your reaction to let your hound off the chain. When you do, it immediately gains {@quickref temporary hit points||3|0} equal to four times your pugilist level and, for the next minute, its speed increases by 15 feet and it can take the bite or {@action Dodge} action (your choice) each turn you don't command it. Once you use this feature, you can't use it again until you finish a {@quickref resting|phb|2|0|long rest}."
 			]
 		},
 		{
@@ -24386,7 +24386,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"At 3rd level, you can tattoo a specific rune on your body to interweave its magic with your primal rage. Choose any {@filter 1st-level spell from the wizard spell list|spells|source=|level=1|class=wizard}. You always have this tattoo spell prepared, and it doesn't count against the number of wizard spells you can prepare each day. You can cast and {@condition concentration|PHB|concentrate} on this spell while you're {@classFeature Rage|Barbarian|PHB|1|raging}, and casting it counts as making an attack for the purpose of maintaining your rage.",
+				"At 3rd level, you can tattoo a specific rune on your body to interweave its magic with your primal rage. Choose any {@filter 1st-level spell from the wizard spell list|spells|source=|level=1|class=wizard}. You always have this tattoo spell prepared, and it doesn't count against the number of wizard spells you can prepare each day. You can cast and {@condition concentration|PHB|concentrate} on this spell while you're {@classFeature Rage|Barbarian||1||raging}, and casting it counts as making an attack for the purpose of maintaining your rage.",
                 "You tattoo yourself with more runes this way when you reach certain levels in this class, choosing spells of any school from the wizard spell list: a {@filter 2nd-level spell|spells|source=|level=2|class=wizard} at 8th level, a {@filter 3rd-level spell|spells|source=|level=3|class=wizard} at 14th level, and a {@filter 4th-level spell|spells|source=|level=4|class=wizard} at 20th level.",
                 "Whenever you gain a level in this class, you can replace one of your tattoo spells with another spell of the same level from the wizard spell list."
 			]
@@ -24432,7 +24432,7 @@
 			"level": 14,
 			"header": 2,
 			"entries": [
-				"Starting at 14th level, while you're {@classFeature Rage|Barbarian|PHB|1|raging}, you add your rage damage bonus to the damage rolls of your tattoo spells.",
+				"Starting at 14th level, while you're {@classFeature Rage|Barbarian||1||raging}, you add your rage damage bonus to the damage rolls of your tattoo spells.",
                 "Additionally, when you cast a spell, you can expend a use of your rage to flood the spell with raging power. When you do, you add your rage damage bonus to the spell attack rolls and spell save DC of the spell for its duration."
 			]
 		},
@@ -24538,7 +24538,7 @@
                     "type": "list",
                     "items": [
                         "You have advantage on saving throws you make to maintain {@condition concentration|PHB} on spells.",
-                        "When you deal damage with a druid spell, you gain a bonus to the damage roll that increases as you gain levels as a barbarian, as shown in the {@classFeature Rage|Barbarian|PHB|1|Rage Damage} column of the Barbarian table.",
+                        "When you deal damage with a druid spell, you gain a bonus to the damage roll that increases as you gain levels as a barbarian, as shown in the {@classFeature Rage|Barbarian||1||Rage Damage} column of the Barbarian table.",
                         "You have resistance to damage from spells."
                     ]
                 },
@@ -24586,7 +24586,7 @@
 			"level": 14,
 			"header": 2,
 			"entries": [
-				"Starting at 14th level, you can channel your magic while in a {@classFeature Rage|Barbarian|PHB|1} or {@subclassFeature Quietude|Barbarian||Sylvan Warden|UltimateAdventurer|3} to reinvigorate your allies. As an action, you can expend a spell slot to cast a curative magic over creatures within 15 feet of you. Choose one creature per level of spell slot expended. Each chosen creature ends one effect of its choice that {@condition blinded}, {@condition deafened}, {@condition paralyzed}, or {@condition poisoned} it, and either regains hit points equal to {@dice 1d12} + your Wisdom modifier (minimum 1) if you are in quietude, or gains {@quickref temporary hit points|PHB|3|0} equal to {@dice 1d12} + your Wisdom modifier (minimum 1) if you are in a rage.",
+				"Starting at 14th level, you can channel your magic while in a {@classFeature Rage|Barbarian|PHB|1} or {@subclassFeature Quietude|Barbarian||Sylvan Warden|UltimateAdventurer|3} to reinvigorate your allies. As an action, you can expend a spell slot to cast a curative magic over creatures within 15 feet of you. Choose one creature per level of spell slot expended. Each chosen creature ends one effect of its choice that {@condition blinded}, {@condition deafened}, {@condition paralyzed}, or {@condition poisoned} it, and either regains hit points equal to {@dice 1d12} + your Wisdom modifier (minimum 1) if you are in quietude, or gains {@quickref temporary hit points||3|0} equal to {@dice 1d12} + your Wisdom modifier (minimum 1) if you are in a rage.",
                 "Using this feature counts as making an attack for the purpose of maintaining your rage, and as casting a spell for the purpose of maintaining your quietude."
 			]
 		},
@@ -25360,7 +25360,7 @@
 					"type": "entries",
 					"name": "Surge",
 					"entries": [
-						"You can use your reaction when you take damage other than psychic damage to gain a bonus to your AC equal to your proficiency bonus against the triggering attack and gain a number of {@quickref temporary hit points|PHB|3|0} equal to your artificer level. You lose all temporary hit points gained from this module after 1 minute."
+						"You can use your reaction when you take damage other than psychic damage to gain a bonus to your AC equal to your proficiency bonus against the triggering attack and gain a number of {@quickref temporary hit points||3|0} equal to your artificer level. You lose all temporary hit points gained from this module after 1 minute."
 					]
 				}
 			]
@@ -25540,7 +25540,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"Until the start of your next turn, the target has advantage on saving throws against being {@condition charmed} or {@condition frightened}."
@@ -25551,7 +25551,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The target has advantage on the first Strength, Dexterity, or Constitution saving throw it makes before the start of your next turn."
@@ -25562,7 +25562,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"If the target chooses to move on its next turn, it must use its movement to move closer to you. This battle cry has no effect on a creature immune to being {@condition charmed}."
@@ -25573,7 +25573,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The first attack made against the target before the start of your next turn is made with disadvantage."
@@ -25584,7 +25584,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The first time the target hits with a weapon attack before the start of your next turn, it gains a bonus to the damage roll equal to your Constitution modifier (minimum 1)."
@@ -25595,7 +25595,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The target can use its reaction to move up to half its speed. If this movement provokes an {@action opportunity attack|PHB|opportunity attacks}, the attack roll is made with disadvantage."
@@ -25606,7 +25606,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The target has disadvantage on attack rolls against targets other than you until the start of your next turn. This battle cry has no effect on a creature immune to being {@condition charmed}."
@@ -25617,7 +25617,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The first time the target makes an attack roll or ability check before the start of your next turn, it can roll a {@dice d4} and add the number rolled to the attack roll or ability check."
@@ -25628,10 +25628,10 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
-				"The target gains {@quickref temporary hit points|PHB|3|0} equal {@dice 1d6} + your Constitution modifier (minimum 1). It loses any of these remaining temporary hit points at the start of your next turn."
+				"The target gains {@quickref temporary hit points||3|0} equal {@dice 1d6} + your Constitution modifier (minimum 1). It loses any of these remaining temporary hit points at the start of your next turn."
 			]
 		},
 		{
@@ -25639,7 +25639,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The target has advantage on the first melee weapon attack it makes before the start of your next turn, and the first attack made against it before then by a creature other than you is made with advantage. This battle cry has no effect on a creature immune to being {@condition charmed}."
@@ -25650,7 +25650,7 @@
 			"source": "UltimateAdventurer",
 			"page": 50,
 			"featureType": [
-				"BC"
+				"BattleCry"
 			],	
 			"entries": [
 				"The target can’t willingly move closer to you during its next turn. This battle cry has no effect on a creature immune to being {@condition frightened}."
@@ -25675,7 +25675,7 @@
 				"Mime"
 			],	
 			"entries": [
-				"Over the course of 1 minute, you can expend a use of your {@classFeature Bardic Inspiration|Bard||1} and mime cooking and serving a meal to magically create invisible food. Roll your Bardic Inspiration die. A single creature can eat the meal, which has no taste but grants the creature {@quickref temporary hit points|PHB|3|0} equal to the result and enough nourishment to sustain it for a single day. If the meal isn't consumed within 10 minutes, it is lost."
+				"Over the course of 1 minute, you can expend a use of your {@classFeature Bardic Inspiration|Bard||1} and mime cooking and serving a meal to magically create invisible food. Roll your Bardic Inspiration die. A single creature can eat the meal, which has no taste but grants the creature {@quickref temporary hit points||3|0} equal to the result and enough nourishment to sustain it for a single day. If the meal isn't consumed within 10 minutes, it is lost."
 			]
 		},
 		{
@@ -27103,7 +27103,7 @@
 				"Mal"
 			],
 			"entries": [
-				"Your curse protects you when you give it a nudge. When you use your {@classFeature Ailment Control|Accursed|UltimateAdventurer|2||Suppress}, you gain {@quickref temporary hit points|PHB|3|0} equal to your accursed level + your curse ability modifier. You lose any remaining temporary hit points from this ability when the {@classFeature Ailment Control|Accursed|UltimateAdventurer|2||Suppress} ends."
+				"Your curse protects you when you give it a nudge. When you use your {@classFeature Ailment Control|Accursed|UltimateAdventurer|2||Suppress}, you gain {@quickref temporary hit points||3|0} equal to your accursed level + your curse ability modifier. You lose any remaining temporary hit points from this ability when the {@classFeature Ailment Control|Accursed|UltimateAdventurer|2||Suppress} ends."
 			]
 		},
 		{
@@ -32249,7 +32249,7 @@
 			},
 			"entries": [
 				"You configure the scrap metal and wiring used as the material components to create a shield generator and then deploy it onto a creature you can see within range.",
-				"The creature gains {@quickref temporary hit points|PHB|3|0} equal to {@dice 1d6} + your spellcasting ability modifier. Until the spell ends, at the start of each of the target's turns, it can choose to gain a number of temporary hit points equal to your spellcasting ability modifier.",
+				"The creature gains {@quickref temporary hit points||3|0} equal to {@dice 1d6} + your spellcasting ability modifier. Until the spell ends, at the start of each of the target's turns, it can choose to gain a number of temporary hit points equal to your spellcasting ability modifier.",
 				"Each time the target takes damage from an attack, you must make an Intelligence saving throw with DC equal to 10 or half the amount of damage the target took, whichever is higher. On a failure, the spell ends.",
 				"When the spell ends, the target loses any remaining temporary hit points from this spell. The shield generator also falls apart into the material components used to create it, and you can reclaim those material components as an action on your turn while you're within 5 feet of them."
 			],
@@ -32783,7 +32783,7 @@
 					"type": "list",
 					"items": [
 						"You are immune to necrotic damage and have resistance to radiant damage.",
-						"You can use your action to touch a willing creature, granting it {@quickref temporary hit points|PHB|3|0} equal to {@dice 4d8} + your spellcasting ability modifier. Alternatively, you can forgo the temporary hit points to cure the target of one disease or neutralize one poison affecting it. This benefit has no effect on undead or constructs.",
+						"You can use your action to touch a willing creature, granting it {@quickref temporary hit points||3|0} equal to {@dice 4d8} + your spellcasting ability modifier. Alternatively, you can forgo the temporary hit points to cure the target of one disease or neutralize one poison affecting it. This benefit has no effect on undead or constructs.",
 						"You can move across a liquid surface\u2014such as water, acid, mud, snow, quicksand, or lava\u2014as if it were harmless solid ground. You are not affected by the effects of such a liquid unless you choose to be affected by them, even if you are entirely submerged in them. This benefit does not magically grant you the ability to breathe in such liquids if you are entirely submerged in them."
 					]
 				}
@@ -32865,7 +32865,7 @@
 				]
 			},
 			"entries": [
-				"Stretching out your hand and pointing your finger at a creature within range, a flash of negative energy briefly connects you to the target. It must succeed on a Constitution saving throw or take {@damage 3d4} necrotic damage, and you gain a number of {@quickref temporary hit points|PHB|3|0} equal to the damage dealt. You lose any temporary hit points granted by this spell after 1 minute."
+				"Stretching out your hand and pointing your finger at a creature within range, a flash of negative energy briefly connects you to the target. It must succeed on a Constitution saving throw or take {@damage 3d4} necrotic damage, and you gain a number of {@quickref temporary hit points||3|0} equal to the damage dealt. You lose any temporary hit points granted by this spell after 1 minute."
 			],
 			"entriesHigherLevel": [
 				{
@@ -32972,7 +32972,7 @@
 			},
 			"entries": [
 				"Divine energy extends from you to a hostile creature of your choice you can see within range, locking you into a sacred duel. Until the spell ends, both you and the target shed {@quickref Vision and Light|PHB|2||bright light} in a 10-foot radius and {@quickref Vision and Light|PHB|2||dim light} for an additional 10 feet. You and the target are immune to the damage, spells, and other effects of creatures outside the duel, and creatures outside the duel are immune to the damage, spells, and other effects belonging to you or the target. You and the target are also incapable of moving farther than 60 feet apart.",
-				"For the duration, you gain 5 {@quickref temporary hit points|PHB|3|0} at the start of each of your turns, and when you hit the target with a weapon attack, the attack deals an additional {@damage 1d4} radiant damage.",
+				"For the duration, you gain 5 {@quickref temporary hit points||3|0} at the start of each of your turns, and when you hit the target with a weapon attack, the attack deals an additional {@damage 1d4} radiant damage.",
 				"The spell ends early if you end one of your subsequent turns without attacking the target or forcing it to make a saving throw, or if either you or the target drops to 0 hit points. You lose all remaining temporary hit points from this spell when the spell ends."
 			],
 			"damageInflict": [
@@ -33053,7 +33053,7 @@
 			},
 			"entries": [
 				"The light dims in a location you specify within range, shadows consuming the light. Until the spell ends, a 30-foot-radius, 40-foot-high cylinder dulls the light within it. Within the cylinder, areas of normally {@quickref Vision and Light|PHB|2||bright light} become {@quickref Vision and Light|PHB|2||dim light}, areas of normally {@quickref Vision and Light|PHB|2||dim light} become {@quickref Vision and Light|PHB|2||darkness}, and areas of normal darkness become magical {@spell darkness||magical darkness}.",
-				"When the cylinder appears, each undead creature within the cylinder gains {@dice 1d12} {@quickref temporary hit points|PHB|3|0} and each non-undead creature within the cylinder takes {@damage 1d12} necrotic damage. While a non-undead creature is in the cylinder, it takes an additional {@damage 1d12} necrotic damage the first time it takes damage each turn. Undead creatures who end their turn in the cylinder gain {@dice 1d12} temporary hit points.",
+				"When the cylinder appears, each undead creature within the cylinder gains {@dice 1d12} {@quickref temporary hit points||3|0} and each non-undead creature within the cylinder takes {@damage 1d12} necrotic damage. While a non-undead creature is in the cylinder, it takes an additional {@damage 1d12} necrotic damage the first time it takes damage each turn. Undead creatures who end their turn in the cylinder gain {@dice 1d12} temporary hit points.",
 				"If you're within 60 feet of the cylinder, you can move it up to 60 feet as a bonus action on your turn.",
 				"If the spell's area ever overlaps with the area of a {@spell dawn|XGE} spell, both spells immediately end."
 			],
@@ -33319,7 +33319,7 @@
 					"items": [
 						"When a creature within 30 feet who can hear you makes a weapon attack, you can expend a spell-song point to roll {@dice 1d6} and add the result to the attack roll. You must choose to do this after the roll is made but before the DM declares whether the attack is successful or not.",
 						"When a creature within 30 feet who can hear you deals damage with a weapon attack, you can expend a spell-song point to cause the attack to deal an additional {@damage 1d6} damage.",
-						"When a creature within 30 feet who can hear you starts its turn, you can expend a spell-song point to embolden them. The creature gains {@dice 1d6} {@quickref temporary hit points|PHB|3|0}."
+						"When a creature within 30 feet who can hear you starts its turn, you can expend a spell-song point to embolden them. The creature gains {@dice 1d6} {@quickref temporary hit points||3|0}."
 					]
 				},
 				"Until the spell ends, you can take an action on your turn to gain up to your spellcasting modifier in spellsong points. You can only take this action twice each casting of this spell. You lose all remaining spell-song points immediately when this spell ends."
@@ -34542,7 +34542,7 @@
 			},
 			"entries": [
 				"You make a sign of protection in the air before you.",
-				"When you do, you gain {@dice 1d6} {@quickref temporary hit points|PHB|3|0}. While you have any temporary hit points remaining from this spell, you lose 1 at the start of each of your turns.",
+				"When you do, you gain {@dice 1d6} {@quickref temporary hit points||3|0}. While you have any temporary hit points remaining from this spell, you lose 1 at the start of each of your turns.",
 				"The temporary hit points granted by this spell increases by {@dice 1d6} when you reach 5th level ({@dice 2d6}), 11th level ({@dice 3d6}), and 17th level ({@dice 4d6})."
 			],
 			"scalingLevelDice": {
@@ -34814,7 +34814,7 @@
 				]
 			},
 			"entries": [
-				"You imbue a willing creature you can see within range with the size, endurance, and power of a giant. The target gains 30 {@quickref temporary hit points|PHB|3|0}. If any of these remain when the spell ends, they are lost.",
+				"You imbue a willing creature you can see within range with the size, endurance, and power of a giant. The target gains 30 {@quickref temporary hit points||3|0}. If any of these remain when the spell ends, they are lost.",
 				"In addition, the target's size\u2014and the size of each object it is wearing and carrying \u2014quadruples in all dimensions, and its weight is multiplied by sixty-four. An item dropped by an affected creature returns to normal size immediately.",
 				"This growth increases the target's size by two categories\u2014from Medium to Huge, for example\u2014up to a maximum of Gargantuan. If there isn't enough room for the target to quadruple its size, the creature and its equipment attains the maximum size possible in the space available. A creature or unsecured object occupying a space required for the creature's size to expand is shunted to the nearest unoccupied space.",
 				"Until the spell ends, the target also gains a +4 bonus to its Strength score, to a maximum of 30. While any of its weapons are enlarged, the target's attacks with them deal an extra {@damage 1d10} damage."
@@ -35108,7 +35108,7 @@
 					"type": "list",
 					"items": [
 						"When a creature within 30 feet who can hear you starts its turn, you can expend a spell-song point to double its movement speed until the end of the turn.",
-						"When a creature within 30 feet who can hear you takes the {@action Attack} action or casts a spell on its turn, you can expend a spell-song point to allow it to use a bonus action to take the {@action Dash}, {@action Disengage}, or {@action Use an Object} action on the same turn.",
+						"When a creature within 30 feet who can hear you takes the {@action Attack} action or casts a spell on its turn, you can expend a spell-song point to allow it to use a bonus action to take the {@action Dash|PHB}, {@action Disengage}, or {@action Use an Object} action on the same turn.",
 						"When a creature within 30 feet who can hear you is targeted by an attack, you can expend a spell-song point to give the creature a +2 to AC until the end of the turn."
 					]
 				},
@@ -36378,7 +36378,7 @@
 						"Nonmagical weather and climate effects will not harm anyone within the area.",
 						"Beasts will not enter the area unless magically compelled to do so.",
 						"Creatures outside the area have disadvantage on ability checks to perceive or find the camp, unless you choose otherwise.",
-						"Creatures that complete a {@quickref resting|phb|2|0|long rest} in the area gain {@dice 1d6} {@quickref temporary hit points|PHB|3|0} at the end of the long rest."
+						"Creatures that complete a {@quickref resting|phb|2|0|long rest} in the area gain {@dice 1d6} {@quickref temporary hit points||3|0} at the end of the long rest."
 					]
 				}
 			],
@@ -37149,7 +37149,7 @@
 			"entries": [
 				"Each creature in a 30-foot-radius sphere centered on a point you can see within range must make a Wisdom saving throw or become {@condition charmed} by you for the duration. While the target is charmed in this way, madness glows in its eyes.",
 				"Choose a creature you can see within range that isn't charmed by you. During each {@condition charmed} creature's turn, it uses its speed to move closer to the chosen target if able, and then uses its action to make a melee attack against the chosen target if it's within range.",
-				"If the chosen target isn't within range, the {@condition charmed} creature instead takes the {@action Dash} action to get as close to the chosen target as possible.",
+				"If the chosen target isn't within range, the {@condition charmed} creature instead takes the {@action Dash|PHB} action to get as close to the chosen target as possible.",
 				"If the chosen target is dead, the {@condition charmed} creature can act normally on its turn.",
 				"On your subsequent turns, you must use your action to maintain control over the {@condition charmed} creatures or the spell ends. As part of this same action, you can choose a new creature you can see within range that isn't {@condition charmed} by you as your chosen target.",
 				"Each {@condition charmed} creature can make a Wisdom saving throw at the end of each of its turns. On a success, it ends the spell's effects on itself."
@@ -37894,7 +37894,7 @@
 				]
 			},
 			"entries": [
-				"As part of casting this spell, you play a chord on the musical instrument used as the material component. The chord rattles your enemies and emboldens your allies. Choose a number of creatures up to your spellcasting ability modifier within range. Chosen creatures gain {@dice 1d6} {@quickref temporary hit points|PHB|3|0}. All other creatures within range must succeed on a Constitution saving throw or take {@damage 1d6} thunder damage."
+				"As part of casting this spell, you play a chord on the musical instrument used as the material component. The chord rattles your enemies and emboldens your allies. Choose a number of creatures up to your spellcasting ability modifier within range. Chosen creatures gain {@dice 1d6} {@quickref temporary hit points||3|0}. All other creatures within range must succeed on a Constitution saving throw or take {@damage 1d6} thunder damage."
 			],
 			"entriesHigherLevel": [
 				{
@@ -41039,7 +41039,7 @@
 				]
 			},
 			"entries": [
-				"Until the spell ends, vines and other plant material rise from your feet to your head, encasing you in protective armor. You increase in size by one category and gain 50 {@quickref temporary hit points|PHB|3|0}.",
+				"Until the spell ends, vines and other plant material rise from your feet to your head, encasing you in protective armor. You increase in size by one category and gain 50 {@quickref temporary hit points||3|0}.",
 				"While you have temporary hit points granted by this spell, you gain the following benefits:",
 				{
 					"type": "list",
@@ -41119,7 +41119,7 @@
 				]
 			},
 			"entries": [
-				"One willing creature you touch gains {@dice 4d6} {@quickref temporary hit points|PHB|3|0}. While the creature has any temporary hit points granted by this spell, it has resistance to damage dealt by spells. The creature loses any temporary hit points it has remaining from this spell at the end of 1 minute."
+				"One willing creature you touch gains {@dice 4d6} {@quickref temporary hit points||3|0}. While the creature has any temporary hit points granted by this spell, it has resistance to damage dealt by spells. The creature loses any temporary hit points it has remaining from this spell at the end of 1 minute."
 			],
 			"entriesHigherLevel": [
 				{
@@ -41213,7 +41213,7 @@
 				]
 			},
 			"entries": [
-				"One willing creature you touch gains {@dice 4d6} {@quickref temporary hit points|PHB|3|0}. While the creature has any temporary hit points granted by this spell, it has resistance to damage dealt by weapons. The creature loses any temporary hit points it has remaining from this spell at the end of 1 minute."
+				"One willing creature you touch gains {@dice 4d6} {@quickref temporary hit points||3|0}. While the creature has any temporary hit points granted by this spell, it has resistance to damage dealt by weapons. The creature loses any temporary hit points it has remaining from this spell at the end of 1 minute."
 			],
 			"entriesHigherLevel": [
 				{