diff --git a/GitTrends.Android/Properties/AndroidManifest.xml b/GitTrends.Android/Properties/AndroidManifest.xml
index e219a354e..880603e50 100644
--- a/GitTrends.Android/Properties/AndroidManifest.xml
+++ b/GitTrends.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="56" android:versionName="2.5.2" package="com.minnick.gittrends" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="57" android:versionName="2.5.3" package="com.minnick.gittrends" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 	<application android:label="GitTrends" android:fullBackupContent="@xml/auto_backup_rules">
diff --git a/GitTrends.Shared/Models/StreamingUrl.cs b/GitTrends.Shared/Models/StreamingUrl.cs
index c4ae69b55..94ca1da41 100644
--- a/GitTrends.Shared/Models/StreamingUrl.cs
+++ b/GitTrends.Shared/Models/StreamingUrl.cs
@@ -5,8 +5,8 @@ public record StreamingManifest
 		public StreamingManifest(string manifestUrl)
 		{
 			ManifestUrl = manifestUrl;
-			HlsUrl = manifestUrl + "(format=m3u8-aapl)";
-			DashUrl = manifestUrl + "(format=mpd-time-csf)";
+			HlsUrl = manifestUrl + "(format=m3u8-cmaf)";
+			DashUrl = manifestUrl + "(format=mpd-time-cmaf)";
 		}
 
 		public string ManifestUrl { get; }
diff --git a/GitTrends.iOS/CustomRenderers/VideoPlayerViewCustomRenderer.cs b/GitTrends.iOS/CustomRenderers/VideoPlayerViewCustomRenderer.cs
index 4fed576fc..2b2b7cacc 100644
--- a/GitTrends.iOS/CustomRenderers/VideoPlayerViewCustomRenderer.cs
+++ b/GitTrends.iOS/CustomRenderers/VideoPlayerViewCustomRenderer.cs
@@ -35,7 +35,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (e.PropertyName is nameof(Element.Url)
+            if (e.PropertyName == VideoPlayerView.UrlProperty.PropertyName
                 && _avPlayerViewController.View is not null
                 && Element.Url is not null)
             {
diff --git a/GitTrends.iOS/Info.plist b/GitTrends.iOS/Info.plist
index 816dbcd4c..3508fa93d 100644
--- a/GitTrends.iOS/Info.plist
+++ b/GitTrends.iOS/Info.plist
@@ -57,14 +57,14 @@
 		<string>processing</string>
 	</array>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.2</string>
+	<string>2.5.3</string>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.minnick.GitTrends.NotifyTrendingRepositories</string>
 		<string>com.minnick.GitTrends.CleanUpDatabase</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>56</string>
+	<string>57</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
diff --git a/GitTrends/ViewModels/RepositoryViewModel.cs b/GitTrends/ViewModels/RepositoryViewModel.cs
index e794bed8e..daa4455c4 100644
--- a/GitTrends/ViewModels/RepositoryViewModel.cs
+++ b/GitTrends/ViewModels/RepositoryViewModel.cs
@@ -35,6 +35,7 @@ public partial class RepositoryViewModel : BaseViewModel
 		readonly GitHubApiRepositoriesService _gitHubApiRepositoriesService;
 
 		IReadOnlyList<Repository> _repositoryList = Array.Empty<Repository>();
+		RefreshState _refreshState;
 
 		[ObservableProperty]
 		bool _isRefreshing;
@@ -102,10 +103,12 @@ public static event EventHandler<PullToRefreshFailedEventArgs> PullToRefreshFail
 
 		RefreshState RefreshState
 		{
+			get => _refreshState;
 			set
 			{
 				EmptyDataViewTitle = EmptyDataViewService.GetRepositoryTitleText(value, !_repositoryList.Any());
 				EmptyDataViewDescription = EmptyDataViewService.GetRepositoryDescriptionText(value, !_repositoryList.Any());
+				_refreshState = value;
 			}
 		}
 
@@ -201,8 +204,8 @@ async Task ExecuteRefresh()
 				AddRepositoriesToCollection(repositoriesFromDatabaseThatDontRequireUpdating, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
 
 
-				var repositoriesWithoutStarsDataAndOver1000Stars = _repositoryList.Where(x => !x.ContainsViewsClonesStarsData && x.StarCount > 1000);
-				var repositoriesWithoutStarsDataAndLessThan1000Stars = _repositoryList.Where(x => !x.ContainsViewsClonesStarsData && x.StarCount <= 1000);
+				var repositoriesWithoutStarsDataAndOver1000Stars = _repositoryList.Where(x => !x.ContainsStarsData && x.StarCount > 1000);
+				var repositoriesWithoutStarsDataAndLessThan1000Stars = _repositoryList.Where(x => !x.ContainsStarsData && x.StarCount <= 1000);
 
 				// Fetch Stars Data in Background for Repositories Containing Over 1000 Stars
 				// GitHub API limits us to 100 StarGazers per Request, meaning that a repository with 24K Stars requires 240 round-trips from GitTrends to GitHub's servers to aggregate the data
@@ -498,8 +501,8 @@ void OnPullToRefreshFailed(PullToRefreshFailedEventArgs pullToRefreshFailedEvent
 			_pullToRefreshFailedEventManager.RaiseEvent(this, pullToRefreshFailedEventArgs, nameof(PullToRefreshFailed));
 		}
 
-		void HandleScheduleRetryRepositoriesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
-		void HandleTrendsViewModelRepositorySavedToDatabase(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
-		void HandleScheduleRetryRepositoriesViewsClonesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
+		void HandleScheduleRetryRepositoriesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
+		void HandleTrendsViewModelRepositorySavedToDatabase(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
+		void HandleScheduleRetryRepositoriesViewsClonesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
 	}
 }
\ No newline at end of file