diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index 79a913970c26f7f3b707c292e4875f837d516a6c..d4942b683a7ac3f7778ec564b6e8214e014e4f6c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -76,7 +76,7 @@ public class AccountController extends BaseController
 	public String requestDeleteAccount(Model model, @PathVariable("ID") Integer ID)
 	{
 		model.addAttribute("accounts", accountService.getAllEntitiesAsc());
-		model.addAttribute("accountToDelete", accountService.getRepository().getOne(ID));
+		model.addAttribute("accountToDelete", accountService.getRepository().getById(ID));
 		return "accounts/deleteAccountModal";
 	}
 
@@ -84,7 +84,7 @@ public class AccountController extends BaseController
 	public String deleteAccountAndReferringTransactions(WebRequest request, Model model, @PathVariable("ID") Integer ID)
 	{
 		// at least one account is required (to delete a sole account another one has to be created first)
-		final Account accountToDelete = accountService.getRepository().getOne(ID);
+		final Account accountToDelete = accountService.getRepository().getById(ID);
 		if(accountService.getRepository().findAllByType(AccountType.CUSTOM).size() > 1)
 		{
 			accountService.deleteAccount(ID);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
index a0d26a869e3be3b46af7974c8d02ee74afc1263a..f987972bbe1768676faed38eb3efb4c88948584b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
@@ -170,7 +170,7 @@ public class ChartController extends BaseController
 		}
 
 		model.addAttribute("charts", chartService.getAllEntitiesAsc());
-		model.addAttribute("chartToDelete", chartService.getRepository().getOne(ID));
+		model.addAttribute("chartToDelete", chartService.getRepository().getById(ID));
 		return "charts/deleteChartModal";
 	}
 
@@ -179,7 +179,7 @@ public class ChartController extends BaseController
 	{
 		if(chartService.isDeletable(ID))
 		{
-			final Chart chartToDelete = chartService.getRepository().getOne(ID);
+			final Chart chartToDelete = chartService.getRepository().getById(ID);
 			chartService.getRepository().deleteById(ID);
 			WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.chart.delete.success", chartToDelete.getName()), NotificationType.SUCCESS));
 		}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index d5206a55c4aeab9443ee4c9837b09efd8f4bdeca..f2ffc45f21499389bb609e63680aa5c7fd27ab6e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -108,7 +108,7 @@ public class TemplateController extends BaseController
 	@GetMapping("/{ID}/delete")
 	public String deleteTemplate(WebRequest request, @PathVariable("ID") Integer ID)
 	{
-		final Template templateToDelete = templateService.getRepository().getOne(ID);
+		final Template templateToDelete = templateService.getRepository().getById(ID);
 		templateService.getRepository().deleteById(ID);
 
 		WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.template.delete.success", templateToDelete.getTemplateName()), NotificationType.SUCCESS));
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index b3c68ce7cfe3a6bb3d666bfd0c699f431a3597c6..6fc12e7d3da76f6fdc708ef5b2ab5158939e39bf 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -86,7 +86,7 @@ public class TransactionController extends BaseController
 
 		DateTime date = dateService.getDateTimeFromCookie(cookieDate);
 		prepareModelTransactions(filterHelpers.getFilterConfiguration(request), model, date);
-		model.addAttribute("transactionToDelete", transactionService.getRepository().getOne(ID));
+		model.addAttribute("transactionToDelete", transactionService.getRepository().getById(ID));
 
 		return "transactions/deleteTransactionModal";
 	}
@@ -106,7 +106,7 @@ public class TransactionController extends BaseController
 	@GetMapping("/{ID}/delete")
 	public String deleteTransaction(WebRequest request, @PathVariable("ID") Integer ID)
 	{
-		final Transaction transactionToDelete = transactionService.getRepository().getOne(ID);
+		final Transaction transactionToDelete = transactionService.getRepository().getById(ID);
 		transactionService.deleteTransaction(ID);
 
 		WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.transaction.delete.success", transactionToDelete.getName()), NotificationType.SUCCESS));
@@ -285,7 +285,7 @@ public class TransactionController extends BaseController
 	@GetMapping("/{ID}/highlight")
 	public String highlight(Model model, @PathVariable("ID") Integer ID)
 	{
-		Transaction transaction = transactionService.getRepository().getOne(ID);
+		Transaction transaction = transactionService.getRepository().getById(ID);
 
 		Account currentAccount = helpers.getCurrentAccount();
 		if(currentAccount.getType() != AccountType.ALL || transaction.isTransfer())
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
index 0c6f2eb8993914e4fca354d1e78777b087b6e519..04b5c605d17c241b0845d09c3e89bfbb0a077306 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
@@ -71,8 +71,8 @@ class TransactionServiceDatabaseTest
 		DateTime date1 = DateTime.parse("2020-04-30", DateTimeFormat.forPattern("yyyy-MM-dd"));
 		FilterConfiguration filterConfiguration = new FilterConfiguration(true, true, true, true, true, null, null, "");
 
-		Transaction transaction1 = transactionService.getRepository().getOne(37);  // normal transaction
-		Transaction transaction2 = transactionService.getRepository().getOne(9);  //transfer
+		Transaction transaction1 = transactionService.getRepository().getById(37);  // normal transaction
+		Transaction transaction2 = transactionService.getRepository().getById(9);  // transfer
 
 		List<Transaction> transactions = transactionService.getTransactionsForAccount(accountService.getRepository().findByName("Second Account"), date1, DateTime.now(), filterConfiguration);
 		assertThat(transactions).hasSize(2)