diff --git a/api/project.go b/api/project.go
index 6fc4d9d..f685215 100644
--- a/api/project.go
+++ b/api/project.go
@@ -20,6 +20,9 @@ func Project(g *gin.RouterGroup, db database.Database) {
 			active := setting == "true"
 			filter.Active = &active
 		}
+		if setting := c.Query("include-semi-active"); setting != "" {
+			filter.IncludeSemiActive = setting == "true"
+		}
 		if setting := c.Query("expiring"); setting != "" {
 			filter.Expiring = setting == "true"
 		}
diff --git a/database/postgres/project.go b/database/postgres/project.go
index fdd626b..f7d9d63 100644
--- a/database/postgres/project.go
+++ b/database/postgres/project.go
@@ -34,7 +34,17 @@ func (r *projectRepository) List(ctx context.Context, filter models.ProjectFilte
 		sq = sq.Where(squirrel.Eq{"project_id": filter.IDs})
 	}
 	if filter.Active != nil {
-		sq = sq.Where(squirrel.Eq{"active": *filter.Active})
+		if filter.IncludeSemiActive {
+			sq = sq.Where(squirrel.Or{
+				squirrel.Eq{"active": *filter.Active},
+				squirrel.Eq{"status_tag": []string{
+					"to do", "background", "on hold", "progress",
+				}},
+			})
+		} else {
+			sq = sq.Where(squirrel.Eq{"active": *filter.Active})
+		}
+
 	}
 	if filter.Expiring {
 		sq = sq.Where("end_time IS NOT NULL")
diff --git a/models/project.go b/models/project.go
index 6866845..89e8e56 100644
--- a/models/project.go
+++ b/models/project.go
@@ -71,11 +71,12 @@ type ProjectResult struct {
 }
 
 type ProjectFilter struct {
-	UserID   string
-	Active   *bool
-	Favorite *bool
-	Expiring bool
-	IDs      []string
+	UserID            string
+	Active            *bool
+	Favorite          *bool
+	Expiring          bool
+	IncludeSemiActive bool
+	IDs               []string
 }
 
 type ProjectRepository interface {
diff --git a/svelte-ui/src/clients/stufflog.ts b/svelte-ui/src/clients/stufflog.ts
index 65fba9b..c4ae943 100644
--- a/svelte-ui/src/clients/stufflog.ts
+++ b/svelte-ui/src/clients/stufflog.ts
@@ -60,7 +60,7 @@ export class StufflogClient {
     return data.project;
   }
 
-  async listProjects({active, expiring, favorite}: ProjectFilter): Promise<ProjectResult[]> {
+  async listProjects({active, expiring, favorite, includeSemiActive}: ProjectFilter): Promise<ProjectResult[]> {
     let queries = [];
     if (active != null) {
       queries.push(`active=${active}`);
@@ -71,6 +71,9 @@ export class StufflogClient {
     if (favorite != null) {
       queries.push(`favorite=${favorite}`)
     }
+    if (includeSemiActive != null) {
+      queries.push(`include-semi-active=${includeSemiActive}`)
+    }
 
     const query = queries.length > 0 ? `?${queries.join("&")}` : "";
 
diff --git a/svelte-ui/src/components/TaskEntry.svelte b/svelte-ui/src/components/TaskEntry.svelte
index 02550a0..f79c2bf 100644
--- a/svelte-ui/src/components/TaskEntry.svelte
+++ b/svelte-ui/src/components/TaskEntry.svelte
@@ -97,6 +97,7 @@
           <Option open={mdTaskLink}>Link</Option>
           <Option open={mdTaskDelete}>Delete</Option>
           ·
+        ·
           {#if !isMoving && (!task.active) }
             <Option on:click={moveToActive}>Active</Option>
           {/if}
@@ -116,6 +117,20 @@
             <Option color="red" on:click={moveToFailed}>Failed</Option>
           {/if}
         {/if}
+      {:else}
+        ·
+        {#if !isMoving && (!task.active) }
+          <Option on:click={moveToActive}>Active</Option>
+        {/if}
+        {#if !isMoving && (task.statusTag !== "to do") }
+          <Option color="yellow" on:click={moveToToDo}>To Do</Option>
+        {/if}
+        {#if !isMoving && (task.statusTag !== "on hold") }
+          <Option color="blue" on:click={moveToOnHold}>On Hold</Option>
+        {/if}
+        {#if !isMoving && task.active }
+          <Option color="green" on:click={moveToCompleted}>Completed</Option>
+        {/if}
       {/if}
     </OptionRow>
     {#if showLogs && task.logs.length > 0}
diff --git a/svelte-ui/src/forms/TaskLinkForm.svelte b/svelte-ui/src/forms/TaskLinkForm.svelte
index 38d7c60..81898f3 100644
--- a/svelte-ui/src/forms/TaskLinkForm.svelte
+++ b/svelte-ui/src/forms/TaskLinkForm.svelte
@@ -1,3 +1,7 @@
+<script lang="ts" context="module">
+  let lastProjectId = "";
+</script>
+
 <script lang="ts">
   import stuffLogClient from "../clients/stufflog";
   import Modal from "../components/Modal.svelte";
@@ -20,7 +24,7 @@
     taskId = md.task.id;
     verb = "Delete";
   } else if (md.name === "tasklink.add") {
-    projectId = (md.project||{id:""}).id;
+    projectId = (md.project||{id:""}).id || lastProjectId;
     taskId = (md.task||{id:""}).id;
   } else {
     throw new Error(`Wrong form ${md.name}`)
@@ -41,6 +45,7 @@
         error = err.message ? err.message : err.toString();
       }).finally(() => {
         loading = false;
+        lastProjectId = projectId;
       })
     } else if (deletion) {
       stuffLogClient.deleteTaskLink(projectId, taskId).then(() => {
@@ -50,6 +55,7 @@
         error = err.message ? err.message : err.toString();
       }).finally(() => {
         loading = false;
+        lastProjectId = projectId;
       })
     }
   }
diff --git a/svelte-ui/src/models/project.ts b/svelte-ui/src/models/project.ts
index 2f7d43e..ba4359c 100644
--- a/svelte-ui/src/models/project.ts
+++ b/svelte-ui/src/models/project.ts
@@ -21,6 +21,7 @@ export interface ProjectFilter {
   active?: boolean
   favorite?: boolean
   expiring?: boolean
+  includeSemiActive?: boolean
 }
 
 export interface ProjectInput {
diff --git a/svelte-ui/src/pages/FrontPage.svelte b/svelte-ui/src/pages/FrontPage.svelte
index 9839cdc..3c7e30f 100644
--- a/svelte-ui/src/pages/FrontPage.svelte
+++ b/svelte-ui/src/pages/FrontPage.svelte
@@ -40,6 +40,7 @@ import ParentEntry from "../components/ParentEntry.svelte";
       fpProjectStore.load({
         active: true,
         expiring: true,
+        includeSemiActive: true,
       });
     }
   }