diff --git a/MeetUpFunctions/Constants.cs b/MeetUpFunctions/Constants.cs
index 3281059..de3898a 100644
--- a/MeetUpFunctions/Constants.cs
+++ b/MeetUpFunctions/Constants.cs
@@ -22,7 +22,7 @@ public static class Constants
         public const string DEFAULT_DISCLAIMER = "Disclaimer";
         public const string DEFAULT_GUEST_DISCLAIMER = "Guest Disclaimer";
 
-        public const string VERSION = "2021-07-27";
+        public const string VERSION = "2021-08-02";
         public const int ADMINOVERBOOKFACTOR = 2;
 
         public const int LOG_TTL = 30 * 24 * 3600; // 30 days TTL for Log items
diff --git a/MeetUpFunctions/GetLinkPreview.cs b/MeetUpFunctions/GetLinkPreview.cs
index e000556..217abb7 100644
--- a/MeetUpFunctions/GetLinkPreview.cs
+++ b/MeetUpFunctions/GetLinkPreview.cs
@@ -55,8 +55,8 @@ public async Task<IActionResult> Run(
             LinkPreviewRequest previewRequest = new LinkPreviewRequest(linkPreview.Url);
 
             LinkPreviewRequest previewResponse = await _linkPreviewRepository.GetLinkDataAsync(previewRequest, false, true, false, true);
-            linkPreview.Title = previewResponse.Result.Title;
-            linkPreview.Description = previewResponse.Result.Description;
+            linkPreview.Title = System.Web.HttpUtility.HtmlDecode(previewResponse.Result.Title);
+            linkPreview.Description = System.Web.HttpUtility.HtmlDecode(previewResponse.Result.Description);
             linkPreview.ImageUrl = previewResponse.Result.ImageUrl;
             linkPreview.Url = previewResponse.Result.Url;
             linkPreview.CanoncialUrl = previewResponse.Result.CanoncialUrl;
diff --git a/MeetUpPlanner/Client/Pages/About.razor b/MeetUpPlanner/Client/Pages/About.razor
index c7acb52..b5deeb8 100644
--- a/MeetUpPlanner/Client/Pages/About.razor
+++ b/MeetUpPlanner/Client/Pages/About.razor
@@ -51,7 +51,7 @@
 </div>
 
 @code {
-    private const string clientVersion = "2021-07-28-2";
+    private const string clientVersion = "2021-08-02";
     private string serverVersion = "tbd";
     private string functionsVersion = "tbd";
 
diff --git a/MeetUpPlanner/Client/Pages/Calendar.razor b/MeetUpPlanner/Client/Pages/Calendar.razor
index be28d1f..43f30c0 100644
--- a/MeetUpPlanner/Client/Pages/Calendar.razor
+++ b/MeetUpPlanner/Client/Pages/Calendar.razor
@@ -75,7 +75,9 @@
                 </div>
                 @if (!String.IsNullOrEmpty(item.LinkImage))
                 {
-                    <img class="card-img-top" src="@item.LinkImage" alt="@item.LinkTitle">
+                    <a href="@item.Link" target="_blank">
+                        <img class="card-img-top" src="@item.LinkImage" alt="@item.LinkTitle">
+                    </a>
                 }
                 <div class="card-body">
                     <h6 class="text-muted card-subtitle mb-2">
diff --git a/MeetUpPlanner/Client/Pages/NewMeetUp.razor b/MeetUpPlanner/Client/Pages/NewMeetUp.razor
index 38d91e5..dad7aa1 100644
--- a/MeetUpPlanner/Client/Pages/NewMeetUp.razor
+++ b/MeetUpPlanner/Client/Pages/NewMeetUp.razor
@@ -248,7 +248,7 @@
         meetup.LinkImage = null;
         LinkPreviewEnabled = !LinkPreviewEnabled;
         this.StateHasChanged();
-        if (LinkPreviewEnabled)
+        if (LinkPreviewEnabled && !String.IsNullOrEmpty(meetup.Link))
         {
             LinkPreview linkPreview = new LinkPreview();
             linkPreview.Url = new Uri(meetup.Link);
@@ -282,6 +282,7 @@
                 // Get referenced calendar item
                 meetup = await Http.GetFromJsonAsync<ExtendedCalendarItem>($"Calendar/extendedcalendaritem?itemId={ItemId}");
                 withoutHost = meetup.WithoutHost;
+                LinkPreviewEnabled = !String.IsNullOrEmpty(meetup.LinkImage);
             }
             else
             {
diff --git a/MeetUpPlanner/Server/Controllers/UtilController.cs b/MeetUpPlanner/Server/Controllers/UtilController.cs
index 433128c..e68ecd9 100644
--- a/MeetUpPlanner/Server/Controllers/UtilController.cs
+++ b/MeetUpPlanner/Server/Controllers/UtilController.cs
@@ -20,7 +20,7 @@ public class UtilController : ControllerBase
     {
         private readonly MeetUpFunctions _meetUpFunctions;
         private readonly ILogger<UtilController> logger;
-        const string serverVersion = "2021-07-27";
+        const string serverVersion = "2021-08-02";
         string functionsVersion = "tbd";
 
         public UtilController(ILogger<UtilController> logger, MeetUpFunctions meetUpFunctions)