diff --git a/InitUiElements.ts b/InitUiElements.ts
index a134fcdf9..3ae6fa0a6 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -152,8 +152,9 @@ export class InitUiElements {
             , State.state.featureSwitchGeolocation)
             .AttachTo("geolocate-button");
 
-
-        updateFavs();
+        if (layoutToUse.id === personal.id) {
+            updateFavs();
+        }
         InitUiElements.setupAllLayerElements();
         
         if (layoutToUse.id === personal.id) {
diff --git a/Models/Constants.ts b/Models/Constants.ts
index 006a3b203..7b399c492 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import { Utils } from "../Utils";
 
 export default class Constants {
     
-    public static vNumber = "0.5.0-rc1";
+    public static vNumber = "0.5.0-rc2";
 
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {
diff --git a/UI/ShowDataLayer.ts b/UI/ShowDataLayer.ts
index 481d78783..eb8879a45 100644
--- a/UI/ShowDataLayer.ts
+++ b/UI/ShowDataLayer.ts
@@ -145,6 +145,7 @@ export default class ShowDataLayer {
         leafletLayer.on("popupopen", () => {
             State.state.selectedElement.setData(feature);
             uiElement.Activate();
+            uiElement.Update();
         })
 
         State.state.selectedElement.addCallbackAndRun(selected => {
diff --git a/package.json b/package.json
index 51ba5800f..98f0b39c4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "optimize-images": "cd assets/generated/ &&  find -name '*.png' -exec optipng '{}' \\; && echo 'PNGs are optimized'",
     "generate": "npm run generate:images && npm run generate:translations",
     "build": "rm -rf dist/ && npm run generate && parcel build --public-url ./ *.html assets/** assets/**/** assets/**/**/** vendor/* vendor/*/*",
-    "prepare-deploy": "npm run generate:editor-layer-index && npm run generate:layouts && npm run generate && npm run build && rm -rf .cache",
+    "prepare-deploy": "npm run test && npm run generate:editor-layer-index && npm run generate:layouts && npm run generate && npm run build && rm -rf .cache",
     "deploy:staging": "npm run prepare-deploy && rm -rf /home/pietervdvn/git/pietervdvn.github.io/Staging/* && cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/Staging/ && cd /home/pietervdvn/git/pietervdvn.github.io/ && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",
     "deploy:production": "rm -rf ./assets/generated && npm run prepare-deploy && npm run optimize-images && rm -rf /home/pietervdvn/git/mapcomplete.github.io/* && cp -r dist/* /home/pietervdvn/git/mapcomplete.github.io/ && cd /home/pietervdvn/git/mapcomplete.github.io/ && echo \"mapcomplete.osm.be\" > CNAME  && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",
     "clean": "rm -rf .cache/ && (find *.html | grep -v \"\\(index\\|land\\|test\\|preferences\\|customGenerator\\).html\" | xargs rm) && rm *.webmanifest"