diff --git a/OpenIZAdmin.Services/Entities/EntityService.cs b/OpenIZAdmin.Services/Entities/EntityService.cs
index 2655dfd7..fa80f8dc 100644
--- a/OpenIZAdmin.Services/Entities/EntityService.cs
+++ b/OpenIZAdmin.Services/Entities/EntityService.cs
@@ -546,6 +546,22 @@ public IEnumerable<T> Search<T>(string searchTerm, string[] expandProperties) wh
 		/// <param name="invertClassConceptFilterCheck">if set to <c>true</c> [invert class concept filter check].</param>
 		/// <returns>Returns a list of entities which match the given search term and class concept key filter.</returns>
 		public IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, string[] expandProperties, bool invertClassConceptFilterCheck = false) where T : Entity
+		{
+			return this.Search<T>(searchTerm, classConceptFilterKey, 0, null, expandProperties, invertClassConceptFilterCheck);
+		}
+
+		/// <summary>
+		/// Searches the specified search term.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="searchTerm">The search term.</param>
+		/// <param name="classConceptFilterKey">The class concept filter key.</param>
+		/// <param name="offset">The offset.</param>
+		/// <param name="count">The count.</param>
+		/// <param name="expandProperties">The expand properties.</param>
+		/// <param name="invertClassConceptFilterCheck">if set to <c>true</c> [invert class concept filter check].</param>
+		/// <returns>Returns a list of entities which match the given search term and class concept key filter.</returns>
+		public IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, int offset, int? count, string[] expandProperties, bool invertClassConceptFilterCheck = false) where T : Entity
 		{
 			var results = new List<T>();
 
@@ -560,7 +576,7 @@ public IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, s
 					queryExpression = p => p.Names.Any(n => n.Component.Any(c => c.Value.Contains(searchTerm))) && p.ClassConceptKey != classConceptFilterKey;
 				}
 
-				var bundle = this.Client.Query<T>(queryExpression, 0, null, expandProperties);
+				var bundle = this.Client.Query<T>(queryExpression, offset, count, expandProperties);
 
 				foreach (var item in bundle.Item.OfType<T>().LatestVersionOnly().Where(queryExpression.Compile()))
 				{
@@ -576,6 +592,7 @@ public IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, s
 				coreAuditService.AuditGenericError(OutcomeIndicator.EpicFail, this.entityAuditService.QueryEntityAuditCode, EventIdentifierType.ApplicationActivity, e);
 				throw;
 			}
+
 			return results;
 		}
 
diff --git a/OpenIZAdmin.Services/Entities/IEntityService.cs b/OpenIZAdmin.Services/Entities/IEntityService.cs
index 99db7f67..6a4d14b4 100644
--- a/OpenIZAdmin.Services/Entities/IEntityService.cs
+++ b/OpenIZAdmin.Services/Entities/IEntityService.cs
@@ -176,6 +176,19 @@ public interface IEntityService
 		/// <returns>Returns a list of entities which match the given search term and class concept key filter.</returns>
 		IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, string[] expandProperties, bool invertClassConceptFilterCheck = false) where T : Entity;
 
+		/// <summary>
+		/// Searches the specified search term.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="searchTerm">The search term.</param>
+		/// <param name="classConceptFilterKey">The class concept filter key.</param>
+		/// <param name="offset">The offset.</param>
+		/// <param name="count">The count.</param>
+		/// <param name="expandProperties">The expand properties.</param>
+		/// <param name="invertClassConceptFilterCheck">if set to <c>true</c> [invert class concept filter check].</param>
+		/// <returns>Returns a list of entities which match the given search term and class concept key filter.</returns>
+		IEnumerable<T> Search<T>(string searchTerm, Guid classConceptFilterKey, int offset, int? count, string[] expandProperties, bool invertClassConceptFilterCheck = false) where T : Entity;
+
 		/// <summary>
 		/// Searches for a specific entity by search term.
 		/// </summary>
diff --git a/OpenIZAdmin/Controllers/PlaceController.cs b/OpenIZAdmin/Controllers/PlaceController.cs
index b4cc8165..92294913 100644
--- a/OpenIZAdmin/Controllers/PlaceController.cs
+++ b/OpenIZAdmin/Controllers/PlaceController.cs
@@ -928,7 +928,7 @@ public ActionResult SearchAddressAjax(string searchTerm, string classConcept)
 
 				if (Guid.TryParse(classConcept, out classConceptKey))
 				{
-					var places = this.entityService.Query<Place>(p => p.Names.Any(n => n.Component.Any(c => c.Value.Contains(searchTerm))) && p.ObsoletionTime == null && p.ClassConceptKey == classConceptKey, 0, 15, new string[] { "typeConcept", "address.use" });
+					var places = this.entityService.Search<Place>(searchTerm, classConceptKey, 0, 15, new []{ "typeConcept", "address.use" });
 
 					results = places.Select(p => new PlaceViewModel(p)).OrderBy(p => p.Name).ToList();
 				}
diff --git a/OpenIZAdmin/Scripts/address-search.js b/OpenIZAdmin/Scripts/address-search.js
index f267e0c7..c52da09d 100644
--- a/OpenIZAdmin/Scripts/address-search.js
+++ b/OpenIZAdmin/Scripts/address-search.js
@@ -28,7 +28,7 @@
         maximumSelectionLength: 1,
         keepSearchResults: true,
         escapeMarkup: function (markup) { return markup; },
-        minimumInputLength: 4,
+        minimumInputLength: 3,
         templateResult: function (data) {
             var retVal = "";
             if (data.data) {