diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 26a0a6d31..c52d16202 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -692,6 +692,7 @@ void EditFilterBox(
 			rules.never());
 		if (title.isEmpty()) {
 			name->showError();
+			box->scrollToY(0);
 			return {};
 		} else if (!(rules.flags() & kTypes) && rules.always().empty()) {
 			window->window().showToast(tr::lng_filters_empty(tr::now));
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 3fa2aeeee..30298fb72 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -87,6 +87,7 @@ void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
 
 void ChatFilterLinkBox(
 		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
 		Data::ChatFilterLink data) {
 	using namespace rpl::mappers;
 
@@ -139,10 +140,20 @@ void ChatFilterLinkBox(
 	labelField->setMaxLength(kMaxLinkTitleLength);
 	Settings::AddDivider(container);
 
+	box->setFocusCallback([=] {
+		labelField->setFocusFast();
+	});
+
 	const auto &saveLabel = link.isEmpty()
 		? tr::lng_formatting_link_create
 		: tr::lng_settings_save;
-	box->addButton(saveLabel(), [=] {});
+	box->addButton(saveLabel(), [=] {
+		session->data().chatsFilters().edit(
+			data.id,
+			data.url,
+			labelField->getLastText().trimmed());
+		box->closeBox();
+	});
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
@@ -420,6 +431,19 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 	}, divider->lifetime());
 }
 
+object_ptr<Ui::BoxContent> DeleteLinkBox(
+		not_null<Window::SessionController*> window,
+		const InviteLinkData &link) {
+	const auto sure = [=](Fn<void()> &&close) {
+		window->session().data().chatsFilters().destroy(link.id, link.url);
+		close();
+	};
+	return Ui::MakeConfirmBox({
+		u"Are you sure you want to delete this link?"_q, // langs
+		sure,
+	});
+}
+
 void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	using namespace Settings;
 
@@ -439,14 +463,14 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			Ui::LayerOption::KeepOther);
 	});
 	const auto editLink = crl::guard(weak, [=] {
-		//delegate()->peerListShowBox(
-		//	EditLinkBox(_window, _data.current()),
-		//	Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(
+			Box(ChatFilterLinkBox, &_window->session(), _data),
+			Ui::LayerOption::KeepOther);
 	});
 	const auto deleteLink = crl::guard(weak, [=] {
-		//delegate()->peerListShowBox(
-		//	DeleteLinkBox(_window, _data.current()),
-		//	Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(
+			DeleteLinkBox(_window, _data),
+			Ui::LayerOption::KeepOther);
 	});
 
 	const auto createMenu = [=] {
@@ -466,7 +490,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			getLinkQr,
 			&st::menuIconQrCode);
 		result->addAction(
-			tr::lng_group_invite_context_edit(tr::now),
+			u"Name Link"_q, // langs
 			editLink,
 			&st::menuIconEdit);
 		result->addAction(
@@ -502,6 +526,8 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 }
 
 void LinkController::prepare() {
+	Expects(!_data.url.isEmpty() || _data.chats.empty());
+
 	setupAboveWidget();
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
@@ -522,7 +548,7 @@ void LinkController::prepare() {
 		delegate()->peerListAppendRow(std::move(row));
 		if (const auto error = ErrorForSharing(history)) {
 			raw->setCustomStatus(*error);
-		} else {
+		} else if (!_data.url.isEmpty()) {
 			_allowed.emplace(peer);
 		}
 	}
@@ -663,32 +689,52 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 	const auto real = static_cast<Row*>(row.get());
 	const auto data = real->data();
 	const auto link = data.url;
+	const auto copyLink = [=] {
+		CopyInviteLink(delegate()->peerListToastParent(), link);
+	};
+	const auto shareLink = [=] {
+		delegate()->peerListShowBox(
+			ShareInviteLinkBox(&_window->session(), link),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto getLinkQr = [=] {
+		delegate()->peerListShowBox(
+			InviteLinkQrBox(link),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto editLink = [=] {
+		delegate()->peerListShowBox(
+			Box(ChatFilterLinkBox, &_window->session(), data),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto deleteLink = [=] {
+		delegate()->peerListShowBox(
+			DeleteLinkBox(_window, data),
+			Ui::LayerOption::KeepOther);
+	};
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
-	result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
-		//CopyInviteLink(delegate()->peerListToastParent(), link);
-	}, &st::menuIconCopy);
-	result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	ShareInviteLinkBox(_peer, link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconShare);
-	result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	InviteLinkQrBox(link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconQrCode);
-	result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	EditLinkBox(_peer, data),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconEdit);
-	result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	DeleteLinkBox(_peer, _admin, link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconDelete);
+	result->addAction(
+		tr::lng_group_invite_context_copy(tr::now),
+		copyLink,
+		&st::menuIconCopy);
+	result->addAction(
+		tr::lng_group_invite_context_share(tr::now),
+		shareLink,
+		&st::menuIconShare);
+	result->addAction(
+		tr::lng_group_invite_context_qr(tr::now),
+		getLinkQr,
+		&st::menuIconQrCode);
+	result->addAction(
+		u"Name Link"_q, // langs
+		editLink,
+		&st::menuIconEdit);
+	result->addAction(
+		tr::lng_group_invite_context_delete(tr::now),
+		deleteLink,
+		&st::menuIconDelete);
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 1404c5fdd..8cf286943 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -454,15 +454,36 @@ void ChatFilters::edit(
 	if (i != end(links)) {
 		i->title = title;
 		_communityLinksUpdated.fire_copy(id);
+
+		_owner->session().api().request(MTPcommunities_EditExportedInvite(
+			MTP_flags(MTPcommunities_EditExportedInvite::Flag::f_title),
+			MTP_inputCommunityDialogFilter(MTP_int(id)),
+			MTP_string(url),
+			MTP_string(title),
+			MTPVector<MTPInputPeer>() // peers
+		)).done([=](const MTPExportedCommunityInvite &result) {
+			//const auto &data = result.data();
+			//const auto link = _owner->chatsFilters().add(id, result);
+			//done(link);
+		}).fail([=](const MTP::Error &error) {
+			//done({ .id = id });
+		}).send();
 	}
 }
 
-void ChatFilters::remove(FilterId id, const QString &url) {
+void ChatFilters::destroy(FilterId id, const QString &url) {
 	auto &links = _communityLinks[id];
 	const auto i = ranges::find(links, url, &ChatFilterLink::url);
 	if (i != end(links)) {
 		links.erase(i);
 		_communityLinksUpdated.fire_copy(id);
+
+		const auto api = &_owner->session().api();
+		api->request(_linksRequestId).cancel();
+		_linksRequestId = api->request(MTPcommunities_DeleteExportedInvite(
+			MTP_inputCommunityDialogFilter(MTP_int(id)),
+			MTP_string(url)
+		)).send();
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 69999a124..83875fd43 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -154,7 +154,7 @@ public:
 		FilterId id,
 		const QString &url,
 		const QString &title);
-	void remove(FilterId id, const QString &url);
+	void destroy(FilterId id, const QString &url);
 	rpl::producer<std::vector<ChatFilterLink>> communityLinks(
 		FilterId id) const;
 	void reloadCommunityLinks(FilterId id);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 4a8dc7e70..a34a584aa 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -629,6 +629,15 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		] {
 			const auto api = &session->api();
 			const auto filters = &session->data().chatsFilters();
+			const auto ids = std::make_shared<
+				base::flat_set<mtpRequestId>
+			>();
+			const auto checkFinished = [=] {
+				if (ids->empty() && next) {
+					Assert(updated.id() != 0);
+					next(updated);
+				}
+			};
 			for (const auto &update : updates) {
 				filters->apply(update);
 			}
@@ -639,15 +648,16 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			for (auto &request : requests) {
 				previousId = api->request(
 					std::move(request)
-				).afterRequest(previousId).send();
+				).done([=](const auto &, mtpRequestId id) {
+					ids->remove(id);
+					checkFinished();
+				}).afterRequest(previousId).send();
+				ids->emplace(previousId);
 			}
 			if (!order.empty() && !addRequests.empty()) {
 				filters->saveOrder(order, previousId);
 			}
-			if (next) {
-				Assert(updated.id() != 0);
-				next(updated);
-			}
+			checkFinished();
 		});
 	};
 	return [copy = state->save] {