diff --git a/approot/templates.xml b/approot/templates.xml
index b0808347..e930225d 100644
--- a/approot/templates.xml
+++ b/approot/templates.xml
@@ -505,7 +505,7 @@
 			<br/>
 			${cover}
 			<br />
-			<h4>${release-name} <br/>${artist-name} - ${year}</h4>
+			<h4>${release-name} <br/>${artist-name}${<if-has-year>} - ${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</h4>
 		</div>
 		<div class="menu row col-md-9">
 			<br/>
@@ -517,7 +517,7 @@
 </message>
 
 <message id="wa-trackview-track">
-	<div class="menu-item list-group-item ">${track-pos}. ${track-name} <span class="badge">${btn}</span><span class="badge">${time}</span></div>
+	<div class="menu-item list-group-item ">${<if-has-disc-num>}${disc-num}-${</if-has-disc-num>}${<if-has-track-num>}${track-num}. ${</if-has-track-num>}${track-name} <span class="badge">${btn}</span><span class="badge">${time}</span></div>
 </message>
 
 </messages>
diff --git a/src/ui/audio/mobile/TrackSearch.cpp b/src/ui/audio/mobile/TrackSearch.cpp
index cad8ca43..3030a743 100644
--- a/src/ui/audio/mobile/TrackSearch.cpp
+++ b/src/ui/audio/mobile/TrackSearch.cpp
@@ -139,7 +139,19 @@ TrackSearch::addResults(size_t nb)
 			releaseContainer->bindWidget("cover", cover);
 			releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText);
 			releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
-			releaseContainer->bindInt("year", release->getReleaseYear());
+			int year = release->getReleaseYear();
+			if (year > 0)
+			{
+				releaseContainer->setCondition("if-has-year", true);
+				releaseContainer->bindInt("year", year);
+
+				int originalYear = release->getReleaseYear(true);
+				if (originalYear > 0 && originalYear != year)
+				{
+					releaseContainer->setCondition("if-has-orig-year", true);
+					releaseContainer->bindInt("orig-year", originalYear);
+				}
+			}
 
 			_currentTrackContainer = new Wt::WContainerWidget();
 			releaseContainer->bindWidget("track-container", _currentTrackContainer);
@@ -150,8 +162,16 @@ TrackSearch::addResults(size_t nb)
 		Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer);
 		trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track"));
 
-		// TODO, do not display track pos for tracks that are not part of a release
- 		trackRes->bindInt("track-pos", track->getTrackNumber());
+		if (track->getTrackNumber() > 0 && !track->getRelease()->isNone())
+		{
+			trackRes->setCondition("if-has-track-num", true);
+	 		trackRes->bindInt("track-num", track->getTrackNumber());
+
+			if (track->getDiscNumber() > 0)
+			{	trackRes->setCondition("if-has-disc-num", true);
+				trackRes->bindInt("disc-num", track->getDiscNumber());
+			}
+		}
  		trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
 		// TODO, display artist name for compilation releases?