diff --git a/zero.Core/Api/MediaApi.cs b/zero.Core/Api/MediaApi.cs
index 12d3a70c..b2d8ba3a 100644
--- a/zero.Core/Api/MediaApi.cs
+++ b/zero.Core/Api/MediaApi.cs
@@ -112,7 +112,7 @@ namespace zero.Core.Api
         dbQuery = dbQuery.WhereIf(x => x.ParentId == query.FolderId, !query.FolderId.IsNullOrEmpty(), x => x.ParentId == null);
       }
 
-      ListResult<MediaListItem> result = await dbQuery.ToQueriedListAsync(query);
+      ListResult<MediaListItem> result = await dbQuery.ToQueriedListAsyncX(query);
 
       foreach (MediaListItem item in result.Items)
       {
diff --git a/zero.Core/Collections/Media/MediaCollection.cs b/zero.Core/Collections/Media/MediaCollection.cs
index 54a07e1a..b91e4c80 100644
--- a/zero.Core/Collections/Media/MediaCollection.cs
+++ b/zero.Core/Collections/Media/MediaCollection.cs
@@ -231,7 +231,7 @@ namespace zero.Core.Collections
         dbQuery = dbQuery.WhereIf(x => x.ParentId == query.FolderId, !query.FolderId.IsNullOrEmpty(), x => x.ParentId == null);
       }
 
-      ListResult<MediaListItem> result = await dbQuery.ToQueriedListAsync(query);
+      ListResult<MediaListItem> result = await dbQuery.ToQueriedListAsyncX(query);
 
       foreach (MediaListItem item in result.Items)
       {
diff --git a/zero.Core/Entities/ListQuery.cs b/zero.Core/Entities/ListQuery.cs
index d9cd0492..50362490 100644
--- a/zero.Core/Entities/ListQuery.cs
+++ b/zero.Core/Entities/ListQuery.cs
@@ -6,6 +6,22 @@ using System.Linq.Expressions;
 
 namespace zero.Core.Entities
 {
+  public class ListBackofficeQuery<T> : ListQuery<T>
+  {
+    public ListBackofficeQuery()
+    {
+      IncludeInactive = true;
+    }
+  }
+
+  public class ListBackofficeQuery<T, TFilter> : ListQuery<T, TFilter> where TFilter : IListSpecificQuery
+  {
+    public ListBackofficeQuery()
+    {
+      IncludeInactive = true;
+    }
+  }
+
   public class ListQuery<T>
   {
     public string Search { get; set; } = null;
@@ -26,6 +42,8 @@ namespace zero.Core.Entities
 
     public int PageSize { get; set; } = 30;
 
+    public bool IncludeInactive { get; set; } = false;
+
     public void SearchFor(params Expression<Func<T, object>>[] selectors)
     {
       SearchSelectors = selectors;
diff --git a/zero.Core/Extensions/RavenQueryableExtensions.cs b/zero.Core/Extensions/RavenQueryableExtensions.cs
index 639f0931..617bc1f0 100644
--- a/zero.Core/Extensions/RavenQueryableExtensions.cs
+++ b/zero.Core/Extensions/RavenQueryableExtensions.cs
@@ -12,10 +12,12 @@ namespace zero.Core.Extensions
 {
   public static class RavenQueryableExtensions
   {
+    // TODO we need to simplify these extensions methods.
+    // ToQueriedListAsyncX is used in MediaCollection for the Media_ByParent index, which produces MediaListItem (which is no IZeroEntity)
     /// <summary>
     /// 
     /// </summary>
-    public static async Task<ListResult<T>> ToQueriedListAsync<T>(this IRavenQueryable<T> queryable, ListQuery<T> query)
+    public static async Task<ListResult<T>> ToQueriedListAsyncX<T>(this IRavenQueryable<T> queryable, ListQuery<T> query)
     {
       queryable = queryable.Statistics(out QueryStatistics stats);
 
@@ -59,7 +61,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// 
     /// </summary>
-    public static async Task<ListResult<T>> ToQueriedListAsync<T, TFilter>(this IRavenQueryable<T> queryable, ListQuery<T, TFilter> query) where TFilter : IListSpecificQuery
+    public static async Task<ListResult<T>> ToQueriedListAsync<T>(this IRavenQueryable<T> queryable, ListQuery<T> query) where T : IZeroEntity
     {
       queryable = queryable.Statistics(out QueryStatistics stats);
 
@@ -67,6 +69,60 @@ namespace zero.Core.Extensions
 
       if (query != null)
       {
+        if (!query.IncludeInactive)
+        {
+          rawQuery = rawQuery.Where(x => x.IsActive);
+        }
+
+        if (!query.Search.IsNullOrEmpty() && query.SearchSelector != null)
+        {
+          rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
+        }
+        if (!query.Search.IsNullOrEmpty() && query.SearchSelectors.Length > 0)
+        {
+          foreach (var selector in query.SearchSelectors)
+          {
+            rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
+          }
+        }
+
+        if (query.OrderQuery != null)
+        {
+          rawQuery = query.OrderQuery(rawQuery);
+        }
+        else if (!query.OrderBy.IsNullOrEmpty())
+        {
+          rawQuery = rawQuery.OrderBy(query.OrderBy, query.OrderIsDescending, query.OrderType == ListQueryOrderType.String ? OrderingType.String : OrderingType.Double);
+        }
+
+        if (query.PageSize > 0)
+        {
+          rawQuery = rawQuery.Paging(query.Page, query.PageSize);
+        }
+      }
+
+      List<T> items = await rawQuery.ToListAsync();
+
+      return new ListResult<T>(items, stats.TotalResults, query.Page, query.PageSize);
+    }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static async Task<ListResult<T>> ToQueriedListAsync<T, TFilter>(this IRavenQueryable<T> queryable, ListQuery<T, TFilter> query) where T : IZeroEntity where TFilter : IListSpecificQuery
+    {
+      queryable = queryable.Statistics(out QueryStatistics stats);
+
+      IQueryable<T> rawQuery = queryable;
+
+      if (query != null)
+      {
+        if (!query.IncludeInactive)
+        {
+          rawQuery = rawQuery.Where(x => x.IsActive);
+        }
+
         if (!query.Search.IsNullOrEmpty() && query.SearchSelector != null)
         {
           rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*");
diff --git a/zero.Web.UI/app/api/media.js b/zero.Web.UI/app/api/media.js
index 5e0b09d8..72439211 100644
--- a/zero.Web.UI/app/api/media.js
+++ b/zero.Web.UI/app/api/media.js
@@ -31,6 +31,10 @@ const getImageSource = (id, thumb, shared) =>
   {
     return id.substring(6) + "?preset=productListing";
   }
+  if (Array.isArray(id))
+  {
+    id = id[0];
+  }
   return zero.apiPath + base + 'streamThumbnail/?id=' + id + (typeof thumb === 'boolean' ? '&thumb=' + (thumb ? 'true' : 'false') : '') + (shared === true ? '&scope=shared' : '');
 };
 
diff --git a/zero.Web/Controllers/ApplicationsController.cs b/zero.Web/Controllers/ApplicationsController.cs
index 308dd006..1f978609 100644
--- a/zero.Web/Controllers/ApplicationsController.cs
+++ b/zero.Web/Controllers/ApplicationsController.cs
@@ -28,7 +28,7 @@ namespace zero.Web.Controllers
     public async Task<IList<IApplication>> GetAll() => await Api.GetAll();
 
 
-    public async Task<ListResult<IApplication>> GetByQuery([FromQuery] ListQuery<IApplication> query) => await Api.GetByQuery(query);
+    public async Task<ListResult<IApplication>> GetByQuery([FromQuery] ListBackofficeQuery<IApplication> query) => await Api.GetByQuery(query);
 
 
     public IReadOnlyCollection<IFeature> GetAllFeatures() => Options.Features.GetAllItems();
diff --git a/zero.Web/Controllers/BackofficeCollectionController.cs b/zero.Web/Controllers/BackofficeCollectionController.cs
index 9b7c7cfc..565f006d 100644
--- a/zero.Web/Controllers/BackofficeCollectionController.cs
+++ b/zero.Web/Controllers/BackofficeCollectionController.cs
@@ -42,7 +42,7 @@ namespace zero.Web.Controllers
     public virtual EditModel<TEntity> GetEmpty([FromServices] TEntity blueprint) => Edit(blueprint);
 
 
-    public virtual async Task<ListResult<TEntity>> GetByQuery([FromQuery] ListQuery<TEntity> query)
+    public virtual async Task<ListResult<TEntity>> GetByQuery([FromQuery] ListBackofficeQuery<TEntity> query)
     {
       query.SearchSelector = model => model.Name;
       IRavenQueryable<TEntity> ravenQuery = Collection.Query;
diff --git a/zero.Web/Controllers/MediaController.cs b/zero.Web/Controllers/MediaController.cs
index 090358a9..b155eb28 100644
--- a/zero.Web/Controllers/MediaController.cs
+++ b/zero.Web/Controllers/MediaController.cs
@@ -30,7 +30,11 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<ListResult<MediaListItem>> GetListByQuery([FromQuery] MediaListItemQuery query) => await Collection.GetListByQuery(query);
+    public async Task<ListResult<MediaListItem>> GetListByQuery([FromQuery] MediaListItemQuery query)
+    {
+      query.IncludeInactive = true;
+      return await Collection.GetListByQuery(query);
+    }
 
 
     [HttpPost]
@@ -45,6 +49,7 @@ namespace zero.Web.Controllers
 
     public async Task<MediaListResultModel> GetAll([FromQuery] MediaListQuery query)
     {
+      query.IncludeInactive = true;
       ListResult<MediaListModel> items = (await Collection.GetByQuery(query)).MapTo(x => new MediaListModel()
       {
         Id = x.Id,
diff --git a/zero.Web/Controllers/RecycleBinController.cs b/zero.Web/Controllers/RecycleBinController.cs
index ee2dda79..d86282d7 100644
--- a/zero.Web/Controllers/RecycleBinController.cs
+++ b/zero.Web/Controllers/RecycleBinController.cs
@@ -15,7 +15,11 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<ListResult<IRecycledEntity>> GetByQuery([FromQuery] RecycleBinListQuery query) => await Api.GetByQuery(query);
+    public async Task<ListResult<IRecycledEntity>> GetByQuery([FromQuery] RecycleBinListQuery query)
+    {
+      query.IncludeInactive = true;
+      return await Api.GetByQuery(query);
+    }
 
 
     public async Task<int> GetCountByOperation([FromQuery] string operationId) => await Api.GetCountByOperation(operationId);
diff --git a/zero.Web/Controllers/SpacesController.cs b/zero.Web/Controllers/SpacesController.cs
index 087d1e21..e9382b31 100644
--- a/zero.Web/Controllers/SpacesController.cs
+++ b/zero.Web/Controllers/SpacesController.cs
@@ -35,7 +35,7 @@ namespace zero.Web.Controllers
     public List<Space> GetAll() => Api.GetAll().Where(space => CanReadSpace(space.Alias)).ToList();
 
 
-    public async Task<IActionResult> GetList([FromQuery] string alias, [FromQuery] ListQuery<ISpaceContent> query = null)
+    public async Task<IActionResult> GetList([FromQuery] string alias, [FromQuery] ListBackofficeQuery<ISpaceContent> query = null)
     {
       if (!CanReadSpace(alias))
       {
diff --git a/zero.Web/Controllers/TranslationsController.cs b/zero.Web/Controllers/TranslationsController.cs
index 78f569db..1a2e0b85 100644
--- a/zero.Web/Controllers/TranslationsController.cs
+++ b/zero.Web/Controllers/TranslationsController.cs
@@ -16,7 +16,7 @@ namespace zero.Web.Controllers
     {
     }
 
-    public override async Task<ListResult<ITranslation>> GetByQuery([FromQuery] ListQuery<ITranslation> query)
+    public override async Task<ListResult<ITranslation>> GetByQuery([FromQuery] ListBackofficeQuery<ITranslation> query)
     {
       query.SearchFor(entity => entity.Key, entity => entity.Value);
       return await Collection.Query.OrderByDescending(x => x.CreatedDate).ToQueriedListAsync(query);
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index ed4f27de..6c5ae225 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -28,7 +28,7 @@ namespace zero.Web.Controllers
     public async Task<EditModel<IBackofficeUser>> GetById([FromQuery] string id) => Edit(await Api.GetUserById(id));
 
 
-    public async Task<ListResult<IBackofficeUser>> GetAll([FromQuery] ListQuery<IBackofficeUser> query) => await Api.GetByQuery(query);
+    public async Task<ListResult<IBackofficeUser>> GetAll([FromQuery] ListBackofficeQuery<IBackofficeUser> query) => await Api.GetByQuery(query);
 
 
     public IList<PermissionCollection> GetAllPermissions() => PermissionsApi.GetAll();