diff --git a/src/index.d.ts b/src/index.d.ts
index 8b5a66b..ef987d3 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -182,9 +182,9 @@ interface LiveAtlasMarkerSetContents {
 
 interface LiveAtlasMarker {
 	tooltip: string;
-	isTooltipHTML: boolean;
+	tooltipHTML?: string;
 	popup?: string;
-	isPopupHTML: boolean;
+	isPopupHTML?: boolean;
 }
 
 interface LiveAtlasPointMarker extends LiveAtlasMarker {
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 08b98e6..ce22c59 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -97,8 +97,8 @@ export const actions: ActionTree<State, State> & Actions = {
 
 		await state.currentMapProvider!.loadServerConfiguration();
 
-		//Skip default map/ui visibility logic if not first load (i.e config reload after hash change)
-		if(!state.firstLoad) {
+		//Skip default map/ui visibility logic if we already have a map selected (i.e config reload after hash change)
+		if(state.currentMap) {
 			return;
 		}