diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 909cfcf1966851a0d61dd8d8c409be00496fdf30..693ded466f7ea65cccca3433ecaec319495fecca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="false">
 
         <activity
             android:name=".UpdatesActivity"
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 28b0ea3f18a44fc61a4afcde0ed64850f64011ea..dd1a503c58bf10fff169ad9fd21e07bce30345fb 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -278,10 +278,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildVersion = mActivity.getString(R.string.list_build_version,
                 update.getDisplayVersion());
 
-        if (buildVersion.equals("")) {
-            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion() + (!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""));
-        }
-
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -487,7 +483,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
                 DateFormat.MEDIUM, update.getTimestamp());
         String buildInfoText = mActivity.getString(R.string.list_build_version_date,
-                update.getVersion()+(!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""), buildDate);
+                update.getDisplayVersion(), buildDate);
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.apply_update_dialog_title)
                 .setMessage(mActivity.getString(resId, buildInfoText,
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 3d523b2b52d51ef9a8b746bb662bfd0e02058599..050fcd7b40e1bf667ca0ed18c749f150c472e792 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -98,12 +98,11 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
-        if (object.has("pre_version")) {
-            update.setPreversion(object.getString("pre_version"));
-         } else {
-            update.setPreversion("");
-         }
-        update.setDisplayVersion(object.getString("display_version"));
+        if(object.has("pre_version") && !object.getString("pre_version").isEmpty()){
+          update.setDisplayVersion(object.getString("version") + "-" + object.getString("pre_version"));
+        } else {
+          update.setDisplayVersion(object.getString("version"));
+        }
         return update;
     }
 
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index 6e328495149670b26c8af3c824f9498f85a3700e..cfa2027ed82bec55334483be351c1447e195a00b 100644
--- a/src/org/lineageos/updater/model/UpdateBase.java
+++ b/src/org/lineageos/updater/model/UpdateBase.java
@@ -23,7 +23,6 @@ public class UpdateBase implements UpdateBaseInfo {
     private long mTimestamp;
     private String mType;
     private String mVersion;
-    private String mPreversion;
     private String mDisplayVersion;
     private long mFileSize;
 
@@ -37,7 +36,6 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
-        mPreversion = update.getPreversion();
         mDisplayVersion = update.getDisplayVersion();
         mFileSize = update.getFileSize();
     }
@@ -87,15 +85,6 @@ public class UpdateBase implements UpdateBaseInfo {
         mVersion = version;
     }
 
-    @Override
-    public String getPreversion() {
-        return mPreversion;
-    }
-
-    public void setPreversion(String preversion) {
-        mPreversion = preversion;
-    }
-
     @Override
     public String getDisplayVersion() {
         return mDisplayVersion;
diff --git a/src/org/lineageos/updater/model/UpdateBaseInfo.java b/src/org/lineageos/updater/model/UpdateBaseInfo.java
index d015c480e9813e8e40694319693f19da744ef481..2921e96fc57c93c510348eb301abdc961ca3bae9 100644
--- a/src/org/lineageos/updater/model/UpdateBaseInfo.java
+++ b/src/org/lineageos/updater/model/UpdateBaseInfo.java
@@ -26,8 +26,6 @@ public interface UpdateBaseInfo {
 
     String getVersion();
 
-    String getPreversion();
-
     String getDisplayVersion();
 
     String getDownloadUrl();