4 files changed, 21 insertions, 7 deletions
diff --git a/src/page/album.js b/src/page/album.js
index 8c08b960..696e2854 100644
--- a/src/page/album.js
+++ b/src/page/album.js
@@ -43,7 +43,8 @@ export function pathsForTarget(album) {
       path: ['albumReferencedArtworks', album.directory],
 
       condition: () =>
-        !empty(album.referencedArtworks),
+        album.hasCoverArt &&
+        !empty(album.coverArtworks[0].referencedArtworks),
 
       contentFunction: {
         name: 'generateAlbumReferencedArtworksPage',
@@ -56,7 +57,8 @@ export function pathsForTarget(album) {
       path: ['albumReferencingArtworks', album.directory],
 
       condition: () =>
-        !empty(album.referencedByArtworks),
+        album.hasCoverArt &&
+        !empty(album.coverArtworks[0].referencedByArtworks),
 
       contentFunction: {
         name: 'generateAlbumReferencingArtworksPage',
diff --git a/src/page/tag.js b/src/page/art-tag.js
index 8942aea9..5b61229d 100644
--- a/src/page/tag.js
+++ b/src/page/art-tag.js
@@ -1,6 +1,6 @@
 // Art tag page specification.
 
-export const description = `per-artwork-tag gallery pages`;
+export const description = `per-art-tag info & gallery pages`;
 
 export function condition({wikiData}) {
   return wikiData.wikiInfo.enableArtTagUI;
@@ -14,7 +14,17 @@ export function pathsForTarget(tag) {
   return [
     {
       type: 'page',
-      path: ['tag', tag.directory],
+      path: ['artTagInfo', tag.directory],
+
+      contentFunction: {
+        name: 'generateArtTagInfoPage',
+        args: [tag],
+      },
+    },
+
+    {
+      type: 'page',
+      path: ['artTagGallery', tag.directory],
 
       contentFunction: {
         name: 'generateArtTagGalleryPage',
diff --git a/src/page/index.js b/src/page/index.js
index 21d93c8f..ae480136 100644
--- a/src/page/index.js
+++ b/src/page/index.js
@@ -1,6 +1,7 @@
 export * as album from './album.js';
 export * as artist from './artist.js';
 export * as artistAlias from './artist-alias.js';
+export * as artTag from './art-tag.js';
 export * as flash from './flash.js';
 export * as flashAct from './flash-act.js';
 export * as group from './group.js';
@@ -8,5 +9,4 @@ export * as homepage from './homepage.js';
 export * as listing from './listing.js';
 export * as news from './news.js';
 export * as static from './static.js';
-export * as tag from './tag.js';
 export * as track from './track.js';
diff --git a/src/page/track.js b/src/page/track.js
index 301af991..95647334 100644
--- a/src/page/track.js
+++ b/src/page/track.js
@@ -25,7 +25,8 @@ export function pathsForTarget(track) {
       path: ['trackReferencedArtworks', track.directory],
 
       condition: () =>
-        !empty(track.referencedArtworks),
+        track.hasUniqueCoverArt &&
+        !empty(track.trackArtworks[0].referencedArtworks),
 
       contentFunction: {
         name: 'generateTrackReferencedArtworksPage',
@@ -38,7 +39,8 @@ export function pathsForTarget(track) {
       path: ['trackReferencingArtworks', track.directory],
 
       condition: () =>
-        !empty(track.referencedByArtworks),
+        track.hasUniqueCoverArt &&
+        !empty(track.trackArtworks[0].referencedByArtworks),
 
       contentFunction: {
         name: 'generateTrackReferencingArtworksPage',