diff --git a/composer.py b/composer.py

index 0784601..95fd078 100644

--- a/composer.py

+++ b/composer.py

@@ -449,6 +449,7 @@ def make_tags_page(session):



 subspace = db.get_subspace(id=post.subspace)

 is_issue_tracker = (subspace.flags & Subspace.ISSUE_TRACKER) != 0

+ session.is_context_tracker = is_issue_tracker



 edit_link = f'/edit-tags/{post.id}'



@@ -491,13 +492,19 @@ def make_tags_page(session):

     return 30, edit_link



 if not req.query:

- page = '# Post Tags\n\n'

+ Kind = "Issue" if is_issue_tracker else "Post"

+ kind = Kind.lower()

+ page = f'# {Kind} Tags\n\n'

     page += 'Editing tags on:\n'

- page += session.gemini_feed_entry(post)

+ page += session.gemini_feed_entry(post, subspace)

     tags = list(filter(lambda tag: tag != Post.TAG_POLL, db.get_tags(post)))

     popular_tags = db.get_popular_tags(subspace)

- if len(tags):

- page += '\n\u200b' + ' '.join(map(lambda t: '#' + t, tags)) + '\n'

+ #if len(tags):

+ # page += '### ' + ' '.join(map(lambda t: '#' + t, tags)) + '\n'

+ if tags:

+ page += f'\nCurrent tags on the {kind} (click to remove):\n'

+ for tag in tags:

+ page += f'=> {edit_link}/remove?{tag} ❌ {tag}\n'



     page += '\n## Add Tag\n'

     page += f'=> {edit_link}/add New tag\n'

@@ -516,11 +523,6 @@ def make_tags_page(session):

         page += f'=> {edit_link}/add?{Post.TAG_ANNOUNCEMENT} 📣 {Post.TAG_ANNOUNCEMENT}\n'

     if is_issue_tracker and Post.TAG_CLOSED not in tags:

         page += f'=> {edit_link}/add?{Post.TAG_CLOSED} ✔︎ {Post.TAG_CLOSED}\n'

-

- if tags:

- page += '\n## Remove Tag\n'

- for tag in tags:

- page += f'=> {edit_link}/remove?{tag} ❌ {tag}\n'

     return page



 return 30, post.page_url()