diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageUrlLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageUrlLoader.java
index 1f40b02f..ff0ce65d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageUrlLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageUrlLoader.java
@@ -16,7 +16,7 @@ public class LastFMArtistImageUrlLoader {
     public static final String TAG = LastFMArtistImageUrlLoader.class.getSimpleName();
 
     public static void loadArtistImageUrl(final Context context, String queryArtist, boolean forceDownload, final ArtistImageUrlLoaderCallback callback) {
-        if (queryArtist != null) {
+        if (queryArtist != null && !queryArtist.trim().equals("<unknown>")) {
             String artistJSON = ArtistJSONStore.getInstance(context).getArtistJSON(queryArtist);
             if (artistJSON != null && !forceDownload) {
                 try {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailUrlLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailUrlLoader.java
index d8cff935..edcd2d8b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailUrlLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailUrlLoader.java
@@ -20,7 +20,7 @@ public class LastFMArtistThumbnailUrlLoader {
     public static final String TAG = LastFMArtistThumbnailUrlLoader.class.getSimpleName();
 
     public static void loadArtistThumbnailUrl(final Context context, String queryArtist, boolean forceDownload, final ArtistThumbnailUrlLoaderCallback callback) {
-        if (queryArtist != null) {
+        if (queryArtist != null && !queryArtist.trim().equals("<unknown>")) {
             String artistJSON = ArtistJSONStore.getInstance(context).getArtistJSON(queryArtist);
             if (artistJSON != null && !forceDownload) {
                 try {
diff --git a/app/src/main/res/layout/item_list_album_song.xml b/app/src/main/res/layout/item_list_album_song.xml
index 50881ece..98af5b16 100644
--- a/app/src/main/res/layout/item_list_album_song.xml
+++ b/app/src/main/res/layout/item_list_album_song.xml
@@ -33,9 +33,8 @@
 
     <TextView
         android:id="@+id/song_duration"
-        android:layout_width="40dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-
         android:layout_gravity="center"
         android:fontFamily="sans-serif"
         android:gravity="center"