 	// MARK: API
 	
 	func restoreSelectionIfNecessary() {
-		if let articleID = coordinator.currentArticle?.articleID, let index = coordinator.indexForArticleID(articleID) {
-			let indexPath = IndexPath(row: index, section: 0)
+		if let indexPath = coordinator.currentArticleIndexPath {
 			tableView.selectRowAndScrollIfNotVisible(at: indexPath, animated: false, deselect: coordinator.isRootSplitCollapsed)
 		}
 	}

	}
	
	func discloseFeedAction(indexPath: IndexPath) -> UIAction? {
		guard let feed = coordinator.articles[indexPath.row].feed else {
			return nil
		}
		let title = NSLocalizedString("Select Feed", comment: "Select Feed")


	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
		
		let article = dataSource.itemIdentifier(for: indexPath)!
		
		// Set up the read action
		let readTitle = article.status.read ?
