diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
index 02149932f..d33c5a0b6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.source.online.english
 
 import android.content.Context
 import android.net.Uri
-import androidx.core.net.toUri
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
@@ -45,10 +44,9 @@ class HBrowse(delegate: HttpSource, val context: Context) :
     override fun parseIntoMetadata(metadata: HBrowseSearchMetadata, input: Document) {
         val tables = parseIntoTables(input)
         with(metadata) {
-            val uri = input.location().toUri()
-            hbId = uri.pathSegments[1].toLong()
+            hbUrl = input.location().removePrefix("$baseUrl/thumbnails")
 
-            hbUrlExtra = uri.pathSegments[2]
+            hbId = hbUrl!!.removePrefix("/").substringBefore("/").toLong()
 
             tags.clear()
             ((tables[""] ?: error("")) + (tables["categories"] ?: error(""))).forEach { (k, v) ->
diff --git a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt
index fbc53cd06..eabd5cf0a 100644
--- a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt
+++ b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt
@@ -9,7 +9,7 @@ import exh.metadata.metadata.base.RaisedSearchMetadata
 class HBrowseSearchMetadata : RaisedSearchMetadata() {
     var hbId: Long? = null
 
-    var hbUrlExtra: String? = null
+    var hbUrl: String? = null
 
     var thumbnail: String? = null
 
@@ -19,7 +19,9 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
     var length: Int? = null
 
     override fun copyTo(manga: SManga) {
-        manga.url = "/$hbId/$hbUrlExtra"
+        hbUrl?.let {
+            manga.url = it
+        }
 
         title?.let {
             manga.title = it
@@ -48,8 +50,8 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
         val pairs = mutableListOf<Pair<String, String>>()
         hbId?.let { pairs += Pair(context.getString(R.string.id), it.toString()) }
-        hbUrlExtra?.let { pairs += Pair(context.getString(R.string.id), it.toString()) }
-        thumbnail?.let { pairs += Pair(context.getString(R.string.thumbnail_url), it.toString()) }
+        hbUrl?.let { pairs += Pair(context.getString(R.string.url), it) }
+        thumbnail?.let { pairs += Pair(context.getString(R.string.thumbnail_url), it) }
         title?.let { pairs += Pair(context.getString(R.string.title), it) }
         length?.let { pairs += Pair(context.getString(R.string.page_count), it.toString()) }
         return pairs