diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index 6826d4aa18..7d12233ef2 100755
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -157,21 +157,21 @@ melm 526$d      arp,arp:n
 #melm 541$d     Date-of-acquisition,Date-of-acquisition:s
 melm 590        Note:w,Note:p
 
-melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject
-melm 600$t      Name-and-title,Title,Subject
+melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject,Subject:p
+melm 600$t      Name-and-title,Title,Subject,Subject:p
 melm 600$9      Koha-Auth-Number
 #melm 600       Name,Personal-name,Subject-heading,Subject-name-personal
 melm 600        Name,Personal-name,Subject-name-personal,Subject,Subject:p
-melm 610$a      Name-and-title
-melm 610$t      Name-and-title,Title
+melm 610$a      Name-and-title,Subject,Subject:p
+melm 610$t      Name-and-title,Title,Subject,Subject:p
 melm 610$9      Koha-Auth-Number
 melm 610        Name,Subject,Subject:p,Corporate-name
-melm 611$a      Name-and-title
-melm 611$t      Name-and-title,Title
+melm 611$a      Name-and-title,Subject,Subject:p
+melm 611$t      Name-and-title,Title,Subject,Subject:p
 melm 611$9      Koha-Auth-Number
 melm 611        Conference-name,Name,Subject,Subject:p
-melm 630$n      Thematic-number
-melm 630$r      Music-key
+melm 630$n      Thematic-number,Subject:Subject:p
+melm 630$r      Music-key,Subject,Subject:p
 melm 630$9      Koha-Auth-Number
 melm 630        Subject,Subject:p
 melm 650$9      Koha-Auth-Number    
@@ -190,9 +190,10 @@ melm 656$9      Koha-Auth-Number
 melm 656        Subject,Subject:p
 melm 657$9      Koha-Auth-Number    
 melm 657        Subject,Subject:p
-melm 658$a	curriculum:w,curriculum:p
-melm 658$b	curriculum:w,curriculum:p
-melm 658$c	curriculum:w,curriculum:p
+melm 658$a	curriculum:w,curriculum:p,Subject,Subject:p
+melm 658$b	curriculum:w,curriculum:p,Subject,Subject:p
+melm 658$c	curriculum:w,curriculum:p,Subject,Subject:p
+melm 658        Subject,Subject:p
 melm 690$9      Koha-Auth-Number    
 melm 690        Subject,Subject:p