diff --git a/src/Task/BuildBuildingTask.ts b/src/Task/BuildBuildingTask.ts
index 8d4cd66..3d24a59 100644
--- a/src/Task/BuildBuildingTask.ts
+++ b/src/Task/BuildBuildingTask.ts
@@ -4,18 +4,17 @@ import { ActionDefinition, TaskController } from './TaskController';
 import { Task } from '../Queue/TaskProvider';
 import { path } from '../Helpers/Path';
 import { registerTask, TaskType } from './TaskMap';
+import { taskError } from '../Errors';
+import { goToResourceViewPage } from './ActionBundles';
 
 @registerTask({ type: TaskType.Building })
 export class BuildBuildingTask extends TaskController {
     defineActions(task: Task): Array<ActionDefinition> {
         const args = task.args;
+        const villageId = args.villageId || taskError('No village id');
+
         return [
-            [
-                GoToPageAction.name,
-                {
-                    path: path('/dorf1.php', { newdid: args.villageId }),
-                },
-            ],
+            goToResourceViewPage(villageId),
             [
                 GoToPageAction.name,
                 {
diff --git a/src/Task/ResourcesToLevel.ts b/src/Task/ResourcesToLevel.ts
index 73d9b31..44a87ca 100644
--- a/src/Task/ResourcesToLevel.ts
+++ b/src/Task/ResourcesToLevel.ts
@@ -1,16 +1,15 @@
 import { TaskController, ActionDefinition } from './TaskController';
-import { GoToPageAction } from '../Action/GoToPageAction';
 import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel';
 import { Task } from '../Queue/TaskProvider';
-import { path } from '../Helpers/Path';
 import { registerTask } from './TaskMap';
+import { goToResourceViewPage } from './ActionBundles';
+import { taskError } from '../Errors';
 
 @registerTask()
 export class ResourcesToLevel extends TaskController {
     defineActions(task: Task): Array<ActionDefinition> {
-        return [
-            [GoToPageAction.name, { path: path('/dorf1.php', { newdid: task.args.villageId }) }],
-            [UpgradeResourceToLevel.name],
-        ];
+        const villageId = task.args.villageId || taskError('No village id');
+
+        return [goToResourceViewPage(villageId), [UpgradeResourceToLevel.name]];
     }
 }
diff --git a/src/Task/UpgradeBuildingTask.ts b/src/Task/UpgradeBuildingTask.ts
index 561a0ab..0cc0c97 100644
--- a/src/Task/UpgradeBuildingTask.ts
+++ b/src/Task/UpgradeBuildingTask.ts
@@ -4,18 +4,17 @@ import { GoToPageAction } from '../Action/GoToPageAction';
 import { Task } from '../Queue/TaskProvider';
 import { path } from '../Helpers/Path';
 import { registerTask, TaskType } from './TaskMap';
+import { goToResourceViewPage } from './ActionBundles';
+import { taskError } from '../Errors';
 
 @registerTask({ type: TaskType.Building })
 export class UpgradeBuildingTask extends TaskController {
     defineActions(task: Task): Array<ActionDefinition> {
         const args = task.args;
+        const villageId = args.villageId || taskError('No village id');
+
         return [
-            [
-                GoToPageAction.name,
-                {
-                    path: path('/dorf1.php', { newdid: args.villageId }),
-                },
-            ],
+            goToResourceViewPage(villageId),
             [
                 GoToPageAction.name,
                 {