diff --git a/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java b/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java
index 5d1bf88..6ccfe69 100644
--- a/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java
+++ b/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java
@@ -1,5 +1,8 @@
 package tech.ailef.dbadmin;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -47,5 +50,13 @@ public class DbAdminProperties {
 		this.modelsPackage = modelsPackage;
 	}
 	
+	public Map<String, String> toMap() {
+		Map<String, String> conf = new HashMap<>();
+		conf.put("enabled", enabled + "");
+		conf.put("baseUrl", baseUrl);
+		conf.put("modelsPackage", modelsPackage);
+		return conf;
+	}
+	
 	
 }
diff --git a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java b/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java
index a14bccb..83410d7 100644
--- a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java
+++ b/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java
@@ -1,6 +1,8 @@
 package tech.ailef.dbadmin.controller.rest;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import tech.ailef.dbadmin.DbAdmin;
+import tech.ailef.dbadmin.DbAdminProperties;
 import tech.ailef.dbadmin.dbmapping.DbAdminRepository;
 import tech.ailef.dbadmin.dbmapping.DbObjectSchema;
 import tech.ailef.dbadmin.dto.PaginatedResult;
@@ -23,6 +26,9 @@ import tech.ailef.dbadmin.exceptions.DbAdminException;
 public class DefaultDbAdminRestController {
 	@Autowired
 	public DbAdmin dbAdmin;
+	
+	@Autowired
+	private DbAdminProperties properties;
 
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
@@ -31,6 +37,11 @@ public class DefaultDbAdminRestController {
 //	@Qualifier("internalJdbc")
 //	private JdbcTemplate internalJdbc;
 	
+//	@GetMapping("/configuration")
+//	public ResponseEntity<?> conf() {
+//		return ResponseEntity.ok(properties.toMap());
+//	}
+	
 	@GetMapping
 	public ResponseEntity<?> index(@RequestParam(required = false) String query) {
 		checkInit();
diff --git a/src/main/resources/static/js/autocomplete-multi.js b/src/main/resources/static/js/autocomplete-multi.js
index 9caf637..96a0873 100644
--- a/src/main/resources/static/js/autocomplete-multi.js
+++ b/src/main/resources/static/js/autocomplete-multi.js
@@ -1,6 +1,6 @@
 /* Request to the autocomplete REST endpoit */
 async function getSuggestions(className, query) {
-	const response = await fetch(`/dbadmin/api/autocomplete/${className}?query=${query}`);
+	const response = await fetch(`/${baseUrl}/api/autocomplete/${className}?query=${query}`);
 	const suggestions = await response.json();
 	return suggestions;
 }
diff --git a/src/main/resources/static/js/autocomplete.js b/src/main/resources/static/js/autocomplete.js
index 0c7cf38..b978416 100644
--- a/src/main/resources/static/js/autocomplete.js
+++ b/src/main/resources/static/js/autocomplete.js
@@ -1,6 +1,6 @@
 /* Request to the autocomplete REST endpoit */
 async function getSuggestions(className, query) {
-	const response = await fetch(`/dbadmin/api/autocomplete/${className}?query=${query}`);
+	const response = await fetch(`/${baseUrl}/api/autocomplete/${className}?query=${query}`);
 	const suggestions = await response.json();
 	return suggestions;
 }
diff --git a/src/main/resources/templates/fragments/resources.html b/src/main/resources/templates/fragments/resources.html
index c51cbcb..22bd05c 100644
--- a/src/main/resources/templates/fragments/resources.html
+++ b/src/main/resources/templates/fragments/resources.html
@@ -12,6 +12,9 @@
 		<script type="text/javascript" src="/js/filters.js"></script>
 		<script type="text/javascript" src="/js/create.js"></script>
 		<title th:text="${title != null ? title + ' | Spring Boot DB Admin Panel' : 'Spring Boot DB Admin Panel'}"></title>
+		<script th:inline="javascript">
+		    let baseUrl = [[ ${baseUrl} ]];
+		</script>
 	</head>
 	
 	<th:block th:fragment="alerts">