diff --git a/api/storeGame.js b/api/storeGame.js
index d32aebf8..cf53ad16 100644
--- a/api/storeGame.js
+++ b/api/storeGame.js
@@ -31,4 +31,6 @@ async function guess(req, res) {
 }
 
 // Limit to 1 request per 5 seconds over a minute, generous limit but better than nothing
-export default ratelimiter(guess, 12, 60000)
\ No newline at end of file
+// export default ratelimiter(guess, 12, 60000)
+// no rate limit
+export default guess;
\ No newline at end of file
diff --git a/components/maps/mapView.js b/components/maps/mapView.js
index a7f6b058..ee056ce9 100644
--- a/components/maps/mapView.js
+++ b/components/maps/mapView.js
@@ -407,7 +407,7 @@ export default function MapView({ inLegacy, gameOptions, setGameOptions, singlep
                 <MapTile
                   key={i + index}
                   map={tileMap}
-                  canHeart={session?.token?.secret && heartingMap !== map.id}
+                  canHeart={session?.token?.secret && heartingMap !== mapsArray[i + index].id}
                   onClick={() => onMapClick(tileMap)}
                   country={tileMap.countryMap}
                   searchTerm={searchTerm}
@@ -435,7 +435,7 @@ export default function MapView({ inLegacy, gameOptions, setGameOptions, singlep
                     });
                   }}
                   onHeart={() => {
-                    heartMap(map);
+                    heartMap(mapsArray[i + index]);
                   }}
                 />
               ))}