diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index f68ba672..1f1bc98b 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -16,6 +16,9 @@
 
 ### Bug Fixes
 
+- Fixed "replaced" oracle tables not showing children
+- Fixed "replaced" move tables showing up twice
+
 ## 3.0.0
 
 ### New Features
diff --git a/src/components/features/charactersAndCampaigns/OracleSection/OracleCollection.tsx b/src/components/features/charactersAndCampaigns/OracleSection/OracleCollection.tsx
index b7beb96f..08e5addc 100644
--- a/src/components/features/charactersAndCampaigns/OracleSection/OracleCollection.tsx
+++ b/src/components/features/charactersAndCampaigns/OracleSection/OracleCollection.tsx
@@ -132,7 +132,7 @@ export function OracleCollection(props: OracleCollectionProps) {
               oracles={oracles}
               disabled={!isExpandedOrForced || disabled}
               visibleOracles={visibleOracles}
-              collectionVisibility={visibleCollections[collectionId]}
+              collectionVisibility={visibleCollections[collection._id]}
             />
           ))}
           {subCollectionIds.map((subCollectionId) => (
diff --git a/src/components/features/charactersAndCampaigns/OracleSection/OracleListItem.tsx b/src/components/features/charactersAndCampaigns/OracleSection/OracleListItem.tsx
index 9d0584aa..0c5701e3 100644
--- a/src/components/features/charactersAndCampaigns/OracleSection/OracleListItem.tsx
+++ b/src/components/features/charactersAndCampaigns/OracleSection/OracleListItem.tsx
@@ -16,7 +16,6 @@ export interface OracleListItemProps {
 export function OracleListItem(props: OracleListItemProps) {
   const { oracleId, oracles, visibleOracles, disabled, collectionVisibility } =
     props;
-
   const oracle = oracles[oracleId];
   const { rollOracleTable } = useRoller();
 
diff --git a/src/stores/rules/helpers/parseMovesIntoMaps.ts b/src/stores/rules/helpers/parseMovesIntoMaps.ts
index 621bda0b..df85622a 100644
--- a/src/stores/rules/helpers/parseMovesIntoMaps.ts
+++ b/src/stores/rules/helpers/parseMovesIntoMaps.ts
@@ -13,8 +13,9 @@ export function parseMovesIntoMaps(
     if (category.contents) {
       if (category.replaces) {
         moveCategoryMap[category.replaces] = category;
+      } else {
+        moveCategoryMap[category._id] = category;
       }
-      moveCategoryMap[category._id] = category;
       nonReplacedMoveCategoryMap[category._id] = category;
       Object.values(category.contents).forEach((move) => {
         if (move.replaces) {