Index: tracker-metadata-tile.c
===================================================================
--- tracker-metadata-tile.c	(revision 514)
+++ tracker-metadata-tile.c	(working copy)
@@ -584,8 +584,10 @@ _int_to_label (GtkWidget *label, const c
 	
 	if (size)
 		temp = g_strdup_printf (string, format);
-	else
+	else {
+		/* Translators: This is if a property is Unknown, eg. 'Date Taken : Unknown' */
 		temp = g_strdup_printf (string, _("Unknown"));
+	}
 	gtk_label_set_markup (GTK_LABEL (label), temp);
 	
 	g_free (temp);
@@ -738,7 +740,13 @@ tracker_metadata_tile_set_uri (TrackerMe
 		gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), icon);
 	else
 		gtk_widget_hide (priv->image);		
-
+	
+	if (priv->type) {
+		g_free (priv->type);
+		priv->type = NULL;
+	}
+	priv->type = g_strdup (type);
+	
 	/* call correct function according to type */
 	if (_file_is_audio (type)) {
 		tracker_metadata_get_async (priv->client, SERVICE_FILES, 
@@ -901,7 +909,7 @@ draw (GtkWidget *widget, cairo_t *cr)
 	cairo_set_font_size (cr, 40);
 
 	cairo_text_extents (cr, priv->type, &extents);
-	x = (width)-(extents.width + extents.x_bearing)-90;
+	x = (width)-(extents.width + extents.x_bearing)-5;
 	y = (height)-(extents.height + extents.y_bearing)-5;
 	
 	
Index: tracker-tag-bar.c
===================================================================
--- tracker-tag-bar.c	(revision 514)
+++ tracker-tag-bar.c	(working copy)
@@ -245,7 +245,7 @@ _on_add_tag_clicked (GtkButton *but, Tra
 	
 	entry = gtk_entry_new ();
 	priv->entry = entry;
-	gtk_entry_set_text (GTK_ENTRY (entry), _("Type tags you want to add here, separated by commas"));
+	gtk_entry_set_text (GTK_ENTRY (entry), _("Type the tags you want to add here, separated by commas"));
 	gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
 	gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE, TRUE, 0);