diff --git a/Azaion.Dataset/DatasetExplorer.xaml.cs b/Azaion.Dataset/DatasetExplorer.xaml.cs
index a0e1e7f..110c272 100644
--- a/Azaion.Dataset/DatasetExplorer.xaml.cs
+++ b/Azaion.Dataset/DatasetExplorer.xaml.cs
@@ -284,7 +284,9 @@ public partial class DatasetExplorer
         SelectedAnnotations.Clear();
         SelectedAnnotationDict.Clear();
         var annotations = _annotationsDict[ExplorerEditor.CurrentAnnClass.YoloId];
-        foreach (var ann in annotations.OrderByDescending(x => x.Value.CreatedDate))
+        foreach (var ann in annotations
+                     .OrderBy(x => x.Value.AnnotationStatus)
+                     .ThenByDescending(x => x.Value.CreatedDate))
         {
             var annThumb = new AnnotationThumbnail(ann.Value);
             SelectedAnnotations.Add(annThumb);
diff --git a/Azaion.Suite.sln b/Azaion.Suite.sln
index 79264b9..9962eb1 100644
--- a/Azaion.Suite.sln
+++ b/Azaion.Suite.sln
@@ -30,7 +30,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CF141A48
 		build\cdn_manager.py = build\cdn_manager.py
 		build\downloader_config.yaml = build\downloader_config.yaml
 		build\build_cdn_manager.cmd = build\build_cdn_manager.cmd
- 		build\jenkins\pipeline = build\jenkins\pipeline
+			build\jenkins\pipeline = build\jenkins\pipeline
+		build\build_dotnet.cmd = build\build_dotnet.cmd
 	EndProjectSection
 EndProject
 Global
diff --git a/build/build_dotnet.cmd b/build/build_dotnet.cmd
new file mode 100644
index 0000000..20c912b
--- /dev/null
+++ b/build/build_dotnet.cmd
@@ -0,0 +1,22 @@
+pushd %~dp0..
+
+echo Build .net app
+dotnet build -c Release
+
+cd Azaion.Suite
+call postbuild.cmd Release
+call upload-file %cd%\config.secured.json
+call upload-file %cd%\config.system.json
+
+dotnet publish -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false -p:ForPublish=true --self-contained true
+cd ..
+rmdir dist /s /q
+xcopy Azaion.Suite\bin\Release\net8.0-windows\win-x64\publish dist\ /s /e /q
+del dist\config.json
+move dist\config.production.json dist\config.json
+
+mkdir dist\dummy
+move dist\Azaion.Annotator.dll dist\dummy\
+move dist\Azaion.Dataset.dll dist\dummy\
+
+popd
\ No newline at end of file
diff --git a/build/publish.cmd b/build/publish.cmd
index 08afa3e..84d4751 100644
--- a/build/publish.cmd
+++ b/build/publish.cmd
@@ -1,30 +1,12 @@
 @echo off
+pushd %~dp0
 
-cd %~dp0..
-echo Build .net app
-dotnet build -c Release
+call build_dotnet
 
-cd Azaion.Suite
-call postbuild.cmd Release
-call upload-file %cd%\config.secured.json
-call upload-file %cd%\config.system.json
-
-dotnet publish -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false -p:ForPublish=true --self-contained true
-cd ..
-rmdir dist /s /q
-xcopy Azaion.Suite\bin\Release\net8.0-windows\win-x64\publish dist\ /s /e /q
-del dist\config.json
-move dist\config.production.json dist\config.json
-
-mkdir dist\dummy
-move dist\Azaion.Annotator.dll dist\dummy\
-move dist\Azaion.Dataset.dll dist\dummy\
-
-call Azaion.Inference\build.cmd
-cd %~dp0..
+call ..\Azaion.Inference\build.cmd
 
 echo Download onnx model
-cd build
+cd %~dp0
 if not exist cdn_manager.exe (
     echo Install cdn_manager
     call build_cdn_manager
@@ -60,3 +42,5 @@ copy C:\\share\gps-models\* %DESTINATION%\models
 
 echo building installer...
 iscc build\installer.iss
+
+popd
\ No newline at end of file