diff --git a/libretroshare/src/gxs/rsdataservice.cc b/libretroshare/src/gxs/rsdataservice.cc
index 5fddf1897..bebcee21d 100644
--- a/libretroshare/src/gxs/rsdataservice.cc
+++ b/libretroshare/src/gxs/rsdataservice.cc
@@ -952,6 +952,8 @@ void RsDataService::locked_updateGrpMetaCache(const RsGxsGrpMetaData& meta)
 
 	if(it != mGrpMetaDataCache.end())
 		*(it->second) = meta ;
+    else
+        mGrpMetaDataCache[meta.mGroupId] = new RsGxsGrpMetaData(meta) ;
 }
 
 void RsDataService::locked_clearGrpMetaCache(const RsGxsGroupId& gid)
diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp
index b80180c9a..bf092c3cc 100644
--- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp
+++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.cpp
@@ -67,6 +67,10 @@ void RsGxsUpdateBroadcastBase::updateBroadcastChanged()
 
 	/* Update only update when the widget is visible. */
 	if (mUpdateWhenInvisible || !widget || widget->isVisible()) {
+
+		if (!mGrpIds.empty() || !mGrpIdsMeta.empty() || !mMsgIds.empty() || !mMsgIdsMeta.empty())
+            mFillComplete = true ;
+
 		securedUpdateDisplay();
 	}
 }
diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h
index 299e7e2a7..ed03bb15c 100644
--- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h
+++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h
@@ -37,7 +37,7 @@ protected:
 	// This is overloaded in subclasses.
 	virtual void updateDisplay(bool complete) = 0;
 
-private slots:
+public slots:
 	void fillDisplay(bool complete);
 
 private: