diff --git a/src/App/Router.php b/src/App/Router.php
index 8373273b78..81cc313eae 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -92,7 +92,19 @@ class Router
 		$this->routeCollector->addRoute(['GET'],         '/bookmarklet',         Module\Bookmarklet::class);
 		$this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
 			$collector->addRoute(['GET'], '[/]',                                 Module\Contact::class);
-			$collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]',     Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}[/]',                        Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/archive',                   Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/block',                     Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/conversations',             Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/drop',                      Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/ignore',                    Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/posts',                     Module\Contact::class);
+			$collector->addRoute(['GET'], '/{id:\d+}/update',                    Module\Contact::class);
+			$collector->addRoute(['GET'], '/all',                                Module\Contact::class);
+			$collector->addRoute(['GET'], '/archived',                           Module\Contact::class);
+			$collector->addRoute(['GET'], '/blocked',                            Module\Contact::class);
+			$collector->addRoute(['GET'], '/hidden',                             Module\Contact::class);
+			$collector->addRoute(['GET'], '/ignored',                            Module\Contact::class);
 		});
 		$this->routeCollector->addRoute(['GET'],         '/credits',             Module\Credits::class);
 		$this->routeCollector->addRoute(['GET'],         '/directory',           Module\Directory::class);
@@ -122,8 +134,8 @@ class Router
 			$collector->addRoute(['GET', 'POST'], '/drop/{group:\d+}',           Module\Group::class);
 			$collector->addRoute(['GET', 'POST'], '/{group:\d+}/{contact:\d+}',  Module\Group::class);
 
-			$collector->addRoute(['POST'], '/{group:\d+}/add/{contact:\d+}',     Module\Group::class);
-			$collector->addRoute(['POST'], '/{group:\d+}/remove/{contact:\d+}',  Module\Group::class);
+			$collector->addRoute(['GET', 'POST'], '/{group:\d+}/add/{contact:\d+}',     Module\Group::class);
+			$collector->addRoute(['GET', 'POST'], '/{group:\d+}/remove/{contact:\d+}',  Module\Group::class);
 		});
 		$this->routeCollector->addRoute(['GET'],         '/hashtag',             Module\Hashtag::class);
 		$this->routeCollector->addRoute(['GET'],         '/home',                Module\Home::class);
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index ea3eecd4a2..42ae32db89 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -367,6 +367,7 @@ class Contact extends BaseModule
 				return;
 			}
 
+			// @TODO: Replace with parameter from router
 			$cmd = $a->argv[2];
 
 			$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
@@ -667,6 +668,7 @@ class Contact extends BaseModule
 		$archived = false;
 		$all = false;
 
+		// @TODO: Replace with parameter from router
 		if (($a->argc == 2) && ($a->argv[1] === 'all')) {
 			$sql_extra = '';
 			$all = true;