diff --git a/Base.lproj/SpotlightPanel.xib b/Base.lproj/SpotlightPanel.xib
index 13d70c474..4286c8d97 100644
--- a/Base.lproj/SpotlightPanel.xib
+++ b/Base.lproj/SpotlightPanel.xib
@@ -130,7 +130,7 @@ DQ
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="16" name="value" keyPath="arrangedObjects.lengthText" id="K4A-L7-jOn">
+                                                <binding destination="16" name="value" keyPath="arrangedObjects.spotlightLength" id="gWF-nL-fqJ">
                                                     <dictionary key="options">
                                                         <bool key="NSConditionallySetsEditable" value="YES"/>
                                                     </dictionary>
@@ -285,9 +285,8 @@ DQ
                 <string>artist</string>
                 <string>album</string>
                 <string>genre</string>
-                <string>lengthText</string>
-                <string>track</string>
-                <string>trackText</string>
+                <string>spotlightLength</string>
+                <string>spotlightTrack</string>
             </declaredKeys>
             <classReference key="objectClass" className="PlaylistEntry"/>
             <connections>
diff --git a/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents b/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
index b0312d583..dec896c75 100644
--- a/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
+++ b/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
@@ -40,6 +40,8 @@
         <attribute name="sampleRate" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="seekable" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="shuffleIndex" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="spotlightLength" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="spotlightTrack" optional="YES" attributeType="String"/>
         <attribute name="stopAfter" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="totalFrames" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="track" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
@@ -50,7 +52,7 @@
         <attribute name="year" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
     </entity>
     <elements>
-        <element name="PlaylistEntry" positionX="-36" positionY="9" width="128" height="674"/>
         <element name="AlbumArtwork" positionX="0" positionY="207" width="128" height="59"/>
+        <element name="PlaylistEntry" positionX="-36" positionY="9" width="128" height="704"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/Spotlight/SpotlightPlaylistEntry.m b/Spotlight/SpotlightPlaylistEntry.m
index 469f3f85d..d58a4386c 100644
--- a/Spotlight/SpotlightPlaylistEntry.m
+++ b/Spotlight/SpotlightPlaylistEntry.m
@@ -26,11 +26,16 @@ extern NSPersistentContainer *__persistentContainer;
 	NSArray *artistTransform =
 	@[@"artist", @"AuthorToArtistTransformer"];
 
+	// Track numbers must sometimes be converted from NSNumber to NSString
+	NSArray *trackTransform =
+	@[@"spotlightTrack", @"NumberToStringTransformer"];
+
 	importKeys = @{ @"kMDItemTitle": @"title",
 		            @"kMDItemAlbum": @"album",
-		            @"kMDItemAudioTrackNumber": @"track",
+		            @"kMDItemAudioTrackNumber": trackTransform,
 		            @"kMDItemRecordingYear": @"year",
 		            @"kMDItemMusicalGenre": @"genre",
+		            @"kMDItemDurationSeconds": @"spotlightLength",
 		            @"kMDItemPath": URLTransform,
 		            @"kMDItemAuthors": artistTransform };
 }
@@ -38,6 +43,8 @@ extern NSPersistentContainer *__persistentContainer;
 + (PlaylistEntry *)playlistEntryWithMetadataItem:(NSMetadataItem *)metadataItem {
 	PlaylistEntry *entry = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistEntry" inManagedObjectContext:__persistentContainer.viewContext];
 
+	entry.deLeted = YES;
+
 	// loop through the keys we want to extract
 	for(NSString *mdKey in importKeys) {
 		id importTarget = [importKeys objectForKey:mdKey];
diff --git a/Spotlight/SpotlightWindowController.m b/Spotlight/SpotlightWindowController.m
index 10f56dac6..c717c550f 100644
--- a/Spotlight/SpotlightWindowController.m
+++ b/Spotlight/SpotlightWindowController.m
@@ -244,8 +244,8 @@ static NSPredicate *musicOnlyPredicate = nil;
 	if([tracks count] == 0)
 		tracks = playlistController.arrangedObjects;
 
-	[playlistLoader willInsertURLs:[tracks valueForKey:@"URL"] origin:URLOriginExternal];
-	[playlistLoader didInsertURLs:[playlistLoader addURLs:[tracks valueForKey:@"URL"] sort:NO] origin:URLOriginExternal];
+	[playlistLoader willInsertURLs:[tracks valueForKey:@"url"] origin:URLOriginExternal];
+	[playlistLoader didInsertURLs:[playlistLoader addURLs:[tracks valueForKey:@"url"] sort:NO] origin:URLOriginExternal];
 	[self.query enableUpdates];
 }