Index: appGallery/index.tt
===================================================================
--- appGallery/index.tt	(revision 7451)
+++ appGallery/index.tt	(working copy)
@@ -11,15 +11,18 @@
 				height: 450,
 				items: [],
 				tabItems: {
+					[% gotservice = 0 %]
 					[% FOREACH service = sortedServices %]
 						[% NEXT UNLESS services.$service.defined %]
+						[% IF gotservice; ", "; END %]
 						[% service %]: {
 							title: "<img src=\"/static/images/spacer.gif\" [% IF services.$service.icon %]style=\"background-image:url(/public/imageproxy?w=34&u=docroot[% services.$service.icon %])\"[% END %]>[% services.$service.fullTitle %]",
 							id: "[% service %]",
 							countries: "[% services.$service.countries %]",
 							settingsPage: "[% (user && !gallery) ? (services.$service.settingsPage || ('/apps/dummySettings/' _ service)) : services.$service.appPage %]",
 							categories: "[% services.$service.categories %]"
-						}[% loop.last() ? "" : "," %]
+						}
+						[% gotservice = 1 %]
 					[% END %]
 				}
 			});
Index: player/viewPlayers.tt
===================================================================
--- player/viewPlayers.tt	(revision 7451)
+++ player/viewPlayers.tt	(working copy)
@@ -17,6 +17,8 @@
 						[% FOREACH controller = controllers %]
 							[% NEXT IF controller.id == hidePlayer %]
 							[% NEXT IF !controller.authorized %]
+
+							[% IF gotdevice; ", "; END %]
 							[% IF (controller.name); 
 								controllername = controller.name;
 							ELSE;
@@ -25,15 +27,16 @@
 								[% "controller_" _ controller.id %]: {
 									title: '[% controllername %]',
 									editLink: 'editController?player=[% controller.id %]'
-								}[% loop.last() ? "" : "," %]
+								}
 							[% gotdevice = 1 %]
 						[% END %]
 					[% END %]
 
 					[% IF players and players.size > 0 %]
-						[% IF gotdevice; ", "; END %]
 						[% FOREACH player = players %]
 							[% NEXT IF player.id == hidePlayer %]
+
+							[% IF gotdevice; ", "; END %]
 							[% IF (player.name); 
 								playername = player.name;
 							ELSE;
@@ -42,9 +45,9 @@
 								[% "player_" _ player.id %]: {
 									title: "<img src=\"/public/imageproxy?w=34&u=docroot/static/images/players/[% (player.model || player.id_model || 'squeezebox3') | replace('squeezebox2','squeezebox3') %].png\"><span id='__PLAYER_TAB_[% player.id %]' style='display:inline'>[% playername %]</span>",
 									editLink: 'editPlayer?player=[% player.id %]'
-								}[% loop.last() ? "" : "," %]
+								}
+							[% gotdevice = 1 %]
 						[% END %]
-						[% gotdevice = 1 %]
 					[% END %]
 
 				}