scrivito_content_browser 1.2.0 → 1.3.0.rc1

data/app/assets/javascripts/dist/scrivito_content_browser_pkg.js

@@ -44,7 +44,7 @@
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var AppComponent, DialogApp, Filter, Provider, ReactDOM, ReactRedux, Redux, configureStore;
+	/* WEBPACK VAR INJECTION */(function(React) {var AppComponent, DialogApp, Filter, Provider, ReactDOM, ReactRedux, configureStore;
 
 	ReactDOM = __webpack_require__(153);
 
@@ -54,13 +54,11 @@
 
 	AppComponent = __webpack_require__(168);
 
-	ReactRedux = __webpack_require__(182);
-
-	Redux = __webpack_require__(190);
+	ReactRedux = __webpack_require__(178);
 
 	Provider = ReactRedux.Provider;
 
-	configureStore = __webpack_require__(249);
+	configureStore = __webpack_require__(248);
 
 	scrivito.content_browser = (function() {
 	  return {
@@ -183,15 +181,9 @@
 
 	scrivito.register_public_api("content_browser", scrivito.content_browser);
 
-	scrivito.select_content = function() {
-	  return scrivito.content_browser.open({
-	    selectionMode: 'single'
-	  });
-	};
-
 	scrivito.register_browse_content(function() {
 	  return scrivito.content_browser.open({
-	    selectionMode: 'multi',
+	    selection_mode: 'single',
 	    standAlone: true
 	  });
 	});
@@ -19244,19 +19236,19 @@
 /* 157 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var CheckboxFilter, Filter, Listenable, RadioFilter, SortCriteria, TreeFilter,
+	var ASC_SORT_ORDER, CheckboxFilter, Filter, Listenable, RadioFilter, TreeFilter,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
 	Listenable = __webpack_require__(158);
 
-	SortCriteria = __webpack_require__(159);
+	RadioFilter = __webpack_require__(159);
 
-	RadioFilter = __webpack_require__(160);
+	TreeFilter = __webpack_require__(163);
 
-	TreeFilter = __webpack_require__(164);
+	CheckboxFilter = __webpack_require__(164);
 
-	CheckboxFilter = __webpack_require__(165);
+	ASC_SORT_ORDER = __webpack_require__(166).ASC_SORT_ORDER;
 
 	Filter = (function(_super) {
 	  __extends(Filter, _super);
@@ -19280,17 +19272,9 @@
 
 	  Filter.prototype.setSearchTerm = function(newTerm) {
 	    this.searchTerm = newTerm;
-	    this.sortCriteria = new SortCriteria("relevance", void 0, "Relevance");
 	    return this.changed();
 	  };
 
-	  Filter.prototype.setSortCriteria = function(sortCriteria) {
-	    if (!this.sortCriteria.equals(sortCriteria)) {
-	      this.sortCriteria = sortCriteria;
-	      return this.changed();
-	    }
-	  };
-
 	  Filter.prototype.getAllFilters = function() {
 	    return _.union(this.getHierarchicalFilters(), this.additionalFilters);
 	  };
@@ -19323,7 +19307,6 @@
 	    var definition, name, subFilters, _results;
 	    this.treeFilters = [];
 	    this.additionalFilters = [];
-	    this.sortCriteria = new SortCriteria();
 	    _results = [];
 	    for (name in filterDefinition) {
 	      if (!__hasProp.call(filterDefinition, name)) continue;
@@ -19416,72 +19399,15 @@
 
 /***/ },
 /* 159 */
-/***/ function(module, exports) {
-
-	var SortCriteria;
-
-	SortCriteria = (function() {
-	  function SortCriteria(type, reverse, activeElement, activeSortItemGroupTitle) {
-	    if (reverse == null) {
-	      reverse = true;
-	    }
-	    if (type == null) {
-	      type = "_last_changed";
-	    }
-	    if (activeElement == null) {
-	      activeElement = "Last change: latest first";
-	    }
-	    if (activeSortItemGroupTitle == null) {
-	      activeSortItemGroupTitle = "Sort by date";
-	    }
-	    this._activeSortItemGroupTitle = activeSortItemGroupTitle;
-	    this._activeElement = activeElement;
-	    this._isReverse = reverse;
-	    this._type = type;
-	  }
-
-	  SortCriteria.prototype.isReverse = function() {
-	    return this._isReverse;
-	  };
-
-	  SortCriteria.prototype.type = function() {
-	    return this._type;
-	  };
-
-	  SortCriteria.prototype.isSortedDesc = function() {
-	    return this._type === "relevance" || !this._isReverse;
-	  };
-
-	  SortCriteria.prototype.activeElement = function() {
-	    return this._activeElement;
-	  };
-
-	  SortCriteria.prototype.activeSortItemGroupTitle = function() {
-	    return this._activeSortItemGroupTitle;
-	  };
-
-	  SortCriteria.prototype.equals = function(sortCriteria) {
-	    return sortCriteria.type() === this._type && sortCriteria.isReverse() === this._isReverse;
-	  };
-
-	  return SortCriteria;
-
-	})();
-
-	module.exports = SortCriteria;
-
-
-/***/ },
-/* 160 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var FilterCollectionNode, RadioFilter, RadioOption,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	FilterCollectionNode = __webpack_require__(161);
+	FilterCollectionNode = __webpack_require__(160);
 
-	RadioOption = __webpack_require__(163);
+	RadioOption = __webpack_require__(162);
 
 	RadioFilter = (function(_super) {
 	  __extends(RadioFilter, _super);
@@ -19516,14 +19442,14 @@
 
 
 /***/ },
-/* 161 */
+/* 160 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var FilterCollectionNode, FilterNode,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	FilterNode = __webpack_require__(162);
+	FilterNode = __webpack_require__(161);
 
 	FilterCollectionNode = (function(_super) {
 	  __extends(FilterCollectionNode, _super);
@@ -19559,7 +19485,7 @@
 
 
 /***/ },
-/* 162 */
+/* 161 */
 /***/ function(module, exports) {
 
 	var FilterNode;
@@ -19588,14 +19514,14 @@
 
 
 /***/ },
-/* 163 */
+/* 162 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var FilterNode, RadioOption,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	FilterNode = __webpack_require__(162);
+	FilterNode = __webpack_require__(161);
 
 	RadioOption = (function(_super) {
 	  __extends(RadioOption, _super);
@@ -19623,14 +19549,14 @@
 
 
 /***/ },
-/* 164 */
+/* 163 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var FilterNode, TreeFilter,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	FilterNode = __webpack_require__(162);
+	FilterNode = __webpack_require__(161);
 
 	TreeFilter = (function(_super) {
 	  __extends(TreeFilter, _super);
@@ -19690,16 +19616,16 @@
 
 
 /***/ },
-/* 165 */
+/* 164 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var CheckboxFilter, CheckboxOption, FilterCollectionNode,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	CheckboxOption = __webpack_require__(166);
+	CheckboxOption = __webpack_require__(165);
 
-	FilterCollectionNode = __webpack_require__(161);
+	FilterCollectionNode = __webpack_require__(160);
 
 	CheckboxFilter = (function(_super) {
 	  __extends(CheckboxFilter, _super);
@@ -19722,14 +19648,14 @@
 
 
 /***/ },
-/* 166 */
+/* 165 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var CheckboxOption, FilterNode,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	FilterNode = __webpack_require__(162);
+	FilterNode = __webpack_require__(161);
 
 	CheckboxOption = (function(_super) {
 	  __extends(CheckboxOption, _super);
@@ -19756,6 +19682,55 @@
 	module.exports = CheckboxOption;
 
 
+/***/ },
+/* 166 */
+/***/ function(module, exports) {
+
+	var ASC_SORT_ORDER, CHANGE_SORT_ORDER, DESC_SORT_ORDER, sortInAscOrder, sortInDescOrder, _changeSortOrder;
+
+	CHANGE_SORT_ORDER = 'CHANGE_SORT_ORDER';
+
+	ASC_SORT_ORDER = 'asc';
+
+	DESC_SORT_ORDER = 'desc';
+
+	_changeSortOrder = (function(_this) {
+	  return function(criteriaType, sortDirection) {
+	    return {
+	      type: CHANGE_SORT_ORDER,
+	      criteriaType: criteriaType,
+	      sortDirection: sortDirection
+	    };
+	  };
+	})(this);
+
+	sortInAscOrder = (function(_this) {
+	  return function(criteriaType, filter) {
+	    return function(dispatch, getState) {
+	      dispatch(_changeSortOrder(criteriaType, ASC_SORT_ORDER));
+	      return filter.trigger("reduxStateChanged", filter);
+	    };
+	  };
+	})(this);
+
+	sortInDescOrder = (function(_this) {
+	  return function(criteriaType, filter) {
+	    return function(dispatch, getState) {
+	      dispatch(_changeSortOrder(criteriaType, DESC_SORT_ORDER));
+	      return filter.trigger("reduxStateChanged", filter);
+	    };
+	  };
+	})(this);
+
+	module.exports = {
+	  CHANGE_SORT_ORDER: CHANGE_SORT_ORDER,
+	  ASC_SORT_ORDER: ASC_SORT_ORDER,
+	  DESC_SORT_ORDER: DESC_SORT_ORDER,
+	  sortInDescOrder: sortInDescOrder,
+	  sortInAscOrder: sortInAscOrder
+	};
+
+
 /***/ },
 /* 167 */
 /***/ function(module, exports) {
@@ -19821,31 +19796,31 @@
 /* 168 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var AddedObjsCollection, App, AppContainer, Filter, Footer, InspectorComponent, Items, MoreItemsSpinner, ObjCollection, ReactRedux, TopBar, disableTags, fetchTags, redux, setLastAddedVisibility, _ref;
+	/* WEBPACK VAR INJECTION */(function(React) {var App, AppContainer, Filter, Footer, InspectorComponent, Items, MoreItemsSpinner, ObjCollection, ReactRedux, TopBar, createObj, disableTags, fetchTags, objDeleted, redux, setLastAddedVisibility, _ref, _ref1;
 
-	AddedObjsCollection = __webpack_require__(169);
+	ObjCollection = __webpack_require__(169);
 
-	ObjCollection = __webpack_require__(178);
+	TopBar = __webpack_require__(176);
 
-	TopBar = __webpack_require__(180);
+	Filter = __webpack_require__(201);
 
-	Filter = __webpack_require__(205);
+	Items = __webpack_require__(213);
 
-	Items = __webpack_require__(217);
+	MoreItemsSpinner = __webpack_require__(239);
 
-	MoreItemsSpinner = __webpack_require__(242);
+	InspectorComponent = __webpack_require__(240);
 
-	InspectorComponent = __webpack_require__(243);
+	Footer = __webpack_require__(244);
 
-	Footer = __webpack_require__(247);
+	ReactRedux = __webpack_require__(178);
 
-	ReactRedux = __webpack_require__(182);
+	redux = __webpack_require__(186);
 
-	redux = __webpack_require__(190);
+	setLastAddedVisibility = __webpack_require__(245).setLastAddedVisibility;
 
-	setLastAddedVisibility = __webpack_require__(248).setLastAddedVisibility;
+	_ref = __webpack_require__(246), createObj = _ref.createObj, objDeleted = _ref.objDeleted;
 
-	_ref = __webpack_require__(241), fetchTags = _ref.fetchTags, disableTags = _ref.disableTags;
+	_ref1 = __webpack_require__(238), fetchTags = _ref1.fetchTags, disableTags = _ref1.disableTags;
 
 	App = React.createClass({
 	  displayName: 'App',
@@ -19854,55 +19829,26 @@
 	      filter: filter
 	    });
 	  },
+	  createObj: function(attributes, basePreset, preset, activeTags) {
+	    this.props.dispatch(createObj(attributes, basePreset, preset, activeTags));
+	    return this.refs.filterView.activateLastAddedFilter();
+	  },
 	  updateObjCollection: function(objCollection) {
 	    return this.setState({
 	      objCollection: objCollection
 	    });
 	  },
-	  updateAddedObjsCollection: function(addedObjsCollection) {
-	    this.setState({
-	      addedObjsCollection: addedObjsCollection
-	    });
-	    if (!addedObjsCollection.hasActiveCreations()) {
-	      if (this.props.lastAdded.isVisible) {
-	        return this._setObjsCollection();
-	      } else {
-	        this._selectLatestAddedObj(addedObjsCollection);
-	        return this.state.objCollection.reload();
-	      }
-	    }
-	  },
 	  updateLastAdded: function(showLastAdded) {
-	    this.props.dispatch(setLastAddedVisibility(showLastAdded));
-	    if (showLastAdded && !this.state.addedObjsCollection.hasActiveCreations()) {
-	      return this._setObjsCollection();
-	    }
+	    return this.props.dispatch(setLastAddedVisibility(showLastAdded));
 	  },
 	  destroyAddedObj: function(objId) {
-	    this.state.addedObjsCollection.destroyCreatedObjById(objId);
-	    if (this.props.lastAdded.isVisible) {
-	      return this._setObjsCollection();
-	    }
+	    return this.props.dispatch(objDeleted(objId));
 	  },
 	  activateInitialFilter: function() {
 	    if (this.refs.filterView.activateInitialFilter) {
 	      return this.refs.filterView.activateInitialFilter();
 	    }
 	  },
-	  _setObjsCollection: function() {
-	    var objs;
-	    objs = this.state.addedObjsCollection.createdObjs();
-	    return this.state.objCollection.setObjs(objs);
-	  },
-	  _selectLatestAddedObj: function(addedObjsCollection) {
-	    var lastCreatedObj;
-	    if (this.refs.filterView.state.selectedFilter === false) {
-	      lastCreatedObj = _.first(addedObjsCollection.createdObjs());
-	      if (lastCreatedObj) {
-	        return this.state.objCollection.toggleSelected(lastCreatedObj.id());
-	      }
-	    }
-	  },
 	  disableTagBar: function() {
 	    return this.props.dispatch(disableTags());
 	  },
@@ -19911,21 +19857,18 @@
 	  },
 	  componentDidMount: function() {
 	    this.state.filter.onChange(this.updateFilter);
-	    this.state.addedObjsCollection.onChange(this.updateAddedObjsCollection);
 	    this.state.objCollection.onChange(this.updateObjCollection);
 	    this.state.objCollection.on('destroy-obj', this.destroyAddedObj);
 	    return this.activateInitialFilter();
 	  },
 	  getInitialState: function() {
-	    var basePreset, initialSelection, selectionMode;
+	    var initialSelection, selectionMode;
 	    initialSelection = this.props.options.selection || [];
 	    selectionMode = this.props.options.selection_mode;
-	    basePreset = this.props.options.base_preset;
 	    return {
 	      filter: this.props.initialFilter,
 	      objs: [],
 	      sortCriteria: this.props.initialFilter.sortCriteria,
-	      addedObjsCollection: new AddedObjsCollection(basePreset),
 	      objCollection: new ObjCollection(initialSelection, selectionMode)
 	    };
 	  },
@@ -19944,8 +19887,9 @@
 	    }, React.createElement("div", {
 	      "className": "scrivito-content-browser-wrapper"
 	    }, React.createElement(TopBar, {
+	      "dispatch": this.props.dispatch,
 	      "filter": this.state.filter,
-	      "sortCriteria": this.state.sortCriteria,
+	      "sortCriteria": this.props.sortCriteria,
 	      "viewMode": this.props.objDisplay.viewMode
 	    }), React.createElement(Filter, {
 	      "ref": "filterView",
@@ -19953,22 +19897,25 @@
 	      "baseQuery": this.props.baseQuery,
 	      "disableTags": this.disableTagBar,
 	      "objCollection": this.state.objCollection,
-	      "activeTags": this.props.tags.activeTags,
+	      "tags": this.props.tags,
 	      "fetchTags": this.fetchTags,
 	      "standAlone": this.props.options.standAlone,
 	      "updateLastAdded": this.updateLastAdded,
-	      "addedObjsCollection": this.state.addedObjsCollection,
+	      "sortCriteria": this.props.sortCriteria,
+	      "additionCount": this.props.lastAdded.additions.length,
 	      "dispatch": this.props.dispatch,
 	      "showLastAdded": this.props.lastAdded.isVisible
 	    }), React.createElement(Items, {
+	      "disableTags": this.disableTagBar,
 	      "ref": "itemView",
 	      "objCollection": this.state.objCollection,
-	      "viewMode": this.props.objDisplay.viewMode,
-	      "dispatch": this.props.dispatch,
+	      "createObj": this.createObj,
 	      "tags": this.props.tags,
-	      "addedObjsCollection": this.state.addedObjsCollection,
-	      "filter": this.state.filter,
-	      "showLastAdded": this.props.lastAdded.isVisible
+	      "dispatch": this.props.dispatch,
+	      "basePreset": this.props.options.base_preset,
+	      "viewMode": this.props.objDisplay.viewMode,
+	      "lastAdded": this.props.lastAdded,
+	      "filter": this.state.filter
 	    }), (this.state.objCollection.isLoadingAdditionalObjs() ? React.createElement(MoreItemsSpinner, {
 	      "objCollection": this.state.objCollection
 	    }) : void 0)), React.createElement(InspectorComponent, {
@@ -19996,226 +19943,242 @@
 /* 169 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var AddedObj, AddedObjsCollection, Listenable,
+	var Deleter, Listenable, Obj, ObjCollection,
 	  __hasProp = {}.hasOwnProperty,
 	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-	AddedObj = __webpack_require__(170);
-
 	Listenable = __webpack_require__(158);
 
-	AddedObjsCollection = (function(_super) {
-	  __extends(AddedObjsCollection, _super);
+	Obj = __webpack_require__(170);
 
-	  function AddedObjsCollection(basePreset) {
-	    if (basePreset == null) {
-	      basePreset = {};
-	    }
-	    AddedObjsCollection.__super__.constructor.call(this);
-	    this._basePreset = basePreset;
-	    this._objs = [];
+	Deleter = __webpack_require__(171);
+
+	ObjCollection = (function(_super) {
+	  __extends(ObjCollection, _super);
+
+	  function ObjCollection(selectedObjsIds, _selectionMode, objs) {
+	    this._selectionMode = _selectionMode;
+	    ObjCollection.__super__.constructor.call(this);
+	    this._selectionMode || (this._selectionMode = 'multi');
+	    this._selectedObjsIds = selectedObjsIds || [];
+	    this._objs = objs || [];
+	    this._isAlreadyReversed = false;
+	    this._curQueryNumber = 0;
 	  }
 
-	  AddedObjsCollection.prototype.objs = function() {
+	  ObjCollection.prototype.objs = function() {
 	    return this._objs;
 	  };
 
-	  AddedObjsCollection.prototype.createdObjs = function() {
-	    return _.map(this._completedObjs(), function(addedObj) {
-	      return addedObj.createdObj();
-	    });
+	  ObjCollection.prototype.hasMoreItems = function() {
+	    return this._nextQuery != null;
 	  };
 
-	  AddedObjsCollection.prototype.count = function() {
-	    return this.objs().length;
+	  ObjCollection.prototype.selectedObjsIds = function() {
+	    return this._selectedObjsIds;
 	  };
 
-	  AddedObjsCollection.prototype.isEmpty = function() {
-	    return this.count() === 0;
+	  ObjCollection.prototype.isSingleElementSelected = function() {
+	    return this.getSelectedObjs().length === 1;
 	  };
 
-	  AddedObjsCollection.prototype.addFiles = function(files, presets) {
-	    if (presets == null) {
-	      presets = {};
-	    }
-	    presets = this._buildPresets(presets);
-	    _.each(files, (function(_this) {
-	      return function(file) {
-	        return _this._objs.unshift(new AddedObj(_this, file, presets));
+	  ObjCollection.prototype.getSelectedObjs = function() {
+	    var selectedObjs;
+	    selectedObjs = [];
+	    _.each(this._selectedObjsIds, (function(_this) {
+	      return function(selected) {
+	        var selectedObj;
+	        selectedObj = _.find(_this._objs, function(obj) {
+	          if (obj != null) {
+	            return obj.id() === selected;
+	          }
+	        });
+	        if (selectedObj != null) {
+	          return selectedObjs.push(selectedObj);
+	        }
 	      };
 	    })(this));
-	    return this.changed();
-	  };
-
-	  AddedObjsCollection.prototype.destroyCreatedObjById = function(objId) {
-	    var addedObj;
-	    addedObj = _.find(this._objs, function(addedObj) {
-	      return addedObj.createdObj().id() === objId;
-	    });
-	    if (addedObj != null) {
-	      return this._objs = _.without(this._objs, addedObj);
-	    }
-	  };
-
-	  AddedObjsCollection.prototype.createObj = function(presets) {
-	    var addedItem;
-	    presets = this._buildPresets(presets);
-	    addedItem = new AddedObj(this, null, presets);
-	    this._objs.unshift(addedItem);
-	    this.changed();
-	    return addedItem;
-	  };
-
-	  AddedObjsCollection.prototype.hasActiveCreations = function() {
-	    return _.some(this._objs, function(upload) {
-	      return upload.status() === 'active';
-	    });
-	  };
-
-	  AddedObjsCollection.prototype.hasFailedCreations = function() {
-	    return this.getFailedObjs().length > 0;
+	    return selectedObjs;
 	  };
 
-	  AddedObjsCollection.prototype.getFailedObjs = function() {
-	    return _.filter(this._objs, function(upload) {
-	      return upload.status() === 'failed';
-	    });
+	  ObjCollection.prototype.deselectObjs = function() {
+	    return this._selectedObjsIds = [];
 	  };
 
-	  AddedObjsCollection.prototype._completedObjs = function() {
-	    return _.filter(this._objs, function(addedObj) {
-	      return addedObj.status() === "completed";
-	    });
+	  ObjCollection.prototype.isLoading = function() {
+	    return !!this._isLoading;
 	  };
 
-	  AddedObjsCollection.prototype._buildPresets = function(presets) {
-	    return _.extend({}, this._basePreset, presets);
+	  ObjCollection.prototype.isLoadingAdditionalObjs = function() {
+	    return !!this._isLoadingAdditionalObjs;
 	  };
 
-	  return AddedObjsCollection;
-
-	})(Listenable);
-
-	module.exports = AddedObjsCollection;
-
-
-/***/ },
-/* 170 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var AddedObj, Fetcher, Obj, QueryBuilder;
-
-	Obj = __webpack_require__(171);
-
-	QueryBuilder = __webpack_require__(172);
-
-	Fetcher = __webpack_require__(176);
-
-	AddedObj = (function() {
-	  function AddedObj(addedObjsCollection, file, presetAttributes) {
-	    var objAttributes;
-	    this.addedObjsCollection = addedObjsCollection;
-	    this.presetAttributes = presetAttributes != null ? presetAttributes : {};
-	    this._fetcher = new Fetcher();
-	    this._fetcher.onChange((function(_this) {
-	      return function() {
-	        return _this._setObj();
-	      };
-	    })(this));
-	    this._updateProgressByStatus();
-	    this._fileName = file != null ? file.name : void 0;
-	    this._uniqueId = _.uniqueId("added_obj_");
-	    objAttributes = this._buildObjAttributes(file, this.presetAttributes);
-	    scrivito.create_obj(objAttributes).done((function(_this) {
-	      return function(objData) {
-	        _this._progress = 50;
-	        _this.addedObjsCollection.changed();
-	        return _this._fetcher.fetch(objData.id);
-	      };
-	    })(this)).fail((function(_this) {
-	      return function(failure) {
-	        _this._failureMessage = failure.message;
-	        return _this._fetcher.fail();
-	      };
-	    })(this));
-	  }
-
-	  AddedObj.prototype.status = function() {
-	    return this._fetcher.status();
+	  ObjCollection.prototype.reload = function() {
+	    if (this._query) {
+	      return this.loadFromBackend(this._query);
+	    } else {
+	      return this._resetObjsCollectionParams();
+	    }
 	  };
 
-	  AddedObj.prototype.createdObj = function() {
-	    return this._obj;
+	  ObjCollection.prototype.isSingleSelectionMode = function() {
+	    return this._selectionMode === 'single';
 	  };
 
-	  AddedObj.prototype.failureMessage = function() {
-	    return this._failureMessage;
+	  ObjCollection.prototype.loadFromBackend = function(query) {
+	    this._query = query;
+	    this._curQueryNumber += 1;
+	    this._resetLoadingState();
+	    if (query) {
+	      this._activateLoading();
+	      return this._initialLoadObjs(query, this._curQueryNumber);
+	    } else {
+	      this._objs = [];
+	      return this.changed();
+	    }
 	  };
 
-	  AddedObj.prototype.fileName = function() {
-	    return this._fileName;
+	  ObjCollection.prototype.toggleSelected = function(obj) {
+	    if (this.isSelected(obj.id())) {
+	      this._selectedObjsIds = _.without(this._selectedObjsIds, obj.id());
+	    } else {
+	      if (this.isSingleSelectionMode()) {
+	        this._selectedObjsIds = [obj.id()];
+	      } else {
+	        this._selectedObjsIds.push(obj.id());
+	      }
+	    }
+	    if (!this.isPresentInObjCollection(obj)) {
+	      this._objs.push(obj);
+	    }
+	    return this.changed();
 	  };
 
-	  AddedObj.prototype.progress = function() {
-	    return this._progress;
+	  ObjCollection.prototype.isPresentInObjCollection = function(obj) {
+	    return _.where(this._objs, obj).length > 0;
 	  };
 
-	  AddedObj.prototype.uniqueId = function() {
-	    return this._uniqueId;
+	  ObjCollection.prototype.isSelected = function(objId) {
+	    return _.contains(this._selectedObjsIds, objId);
 	  };
 
-	  AddedObj.prototype._setObj = function() {
-	    if (this.status() === 'completed') {
-	      this._obj = new Obj(this._fetcher.obj());
+	  ObjCollection.prototype.loadNextPage = function() {
+	    var queryNumber;
+	    if (this.hasMoreItems() && !this.isLoadingAdditionalObjs()) {
+	      this._activateIsLoadingAdditionalObjs();
+	      queryNumber = this._curQueryNumber;
+	      return this._nextQuery.load_batch().done((function(_this) {
+	        return function(results, next) {
+	          return _this._setAndLoadObjs(results, next, queryNumber);
+	        };
+	      })(this)).fail((function(_this) {
+	        return function() {
+	          _this._resetLoadingState();
+	          return _this.changed();
+	        };
+	      })(this));
 	    }
-	    return this._updateStatus();
 	  };
 
-	  AddedObj.prototype._updateProgressByStatus = function() {
-	    return this._progress = (function() {
-	      switch (this.status()) {
-	        case 'active':
-	          return 10;
-	        case 'completed':
-	          return 100;
-	        case 'failed':
-	          return 0;
-	      }
-	    }).call(this);
+	  ObjCollection.prototype.destroySelectedObjs = function() {
+	    var deferreds;
+	    if (this._selectedObjsIds.length > 0) {
+	      deferreds = _.map(this._selectedObjsIds, (function(_this) {
+	        return function(objId) {
+	          return _this._destroyById(objId);
+	        };
+	      })(this));
+	      $.when.apply($, deferreds).always((function(_this) {
+	        return function() {
+	          return _this.reload();
+	        };
+	      })(this));
+	      return this._activateLoading();
+	    }
 	  };
 
-	  AddedObj.prototype._updateStatus = function() {
-	    this._updateProgressByStatus();
-	    return this.addedObjsCollection.changed();
+	  ObjCollection.prototype._destroyById = function(objId) {
+	    var deleter;
+	    deleter = new Deleter(objId);
+	    return deleter.deleteObj().always((function(_this) {
+	      return function() {
+	        _this._objs = _this._objs.filter(function(obj) {
+	          return obj.id() !== objId;
+	        });
+	        _this._selectedObjsIds = _this._selectedObjsIds.filter(function(selectedObjId) {
+	          return selectedObjId !== objId;
+	        });
+	        return _this.trigger('destroy-obj', objId);
+	      };
+	    })(this));
 	  };
 
-	  AddedObj.prototype._buildObjAttributes = function(file, presetAttributes) {
-	    var objAttributes;
-	    objAttributes = {};
-	    if (file) {
-	      _.extend(objAttributes, this._fileAttributes(file));
-	    }
-	    return _.extend(objAttributes, presetAttributes);
+	  ObjCollection.prototype._resetLoadingState = function() {
+	    this._nextQuery = null;
+	    this._isLoadingAdditionalObjs = false;
+	    return this._isLoading = false;
 	  };
 
-	  AddedObj.prototype._fileAttributes = function(file) {
-	    var objClass;
-	    objClass = scrivito.default_obj_class_for_content_type(file.type);
-	    return {
-	      blob: file,
-	      _obj_class: objClass
-	    };
+	  ObjCollection.prototype._initialLoadObjs = function(query, queryNumber) {
+	    return query.load_batch().done((function(_this) {
+	      return function(results, next) {
+	        _this._isLoading = false;
+	        if (queryNumber === _this._curQueryNumber) {
+	          _this._objs = [];
+	          return _this._setAndLoadObjs(results, next, queryNumber);
+	        }
+	      };
+	    })(this)).fail((function(_this) {
+	      return function() {
+	        _this._resetLoadingState();
+	        return _this.changed();
+	      };
+	    })(this));
+	  };
+
+	  ObjCollection.prototype._setAndLoadObjs = function(results, next, queryNumber) {
+	    var curObjs;
+	    if (queryNumber === this._curQueryNumber) {
+	      this._isLoadingAdditionalObjs = false;
+	      curObjs = _.map(results.hits, function(attr) {
+	        return new Obj(attr);
+	      });
+	      this._objs = this._objs.concat(curObjs);
+	      this._nextQuery = next;
+	      return this.changed();
+	    }
 	  };
 
-	  return AddedObj;
+	  ObjCollection.prototype._activateLoading = function() {
+	    if (!this.isLoading()) {
+	      this._isLoading = true;
+	      return this.changed();
+	    }
+	  };
 
-	})();
+	  ObjCollection.prototype._resetObjsCollectionParams = function() {
+	    this._query = null;
+	    this.deselectObjs();
+	    this._resetLoadingState();
+	    return this.changed();
+	  };
 
-	module.exports = AddedObj;
+	  ObjCollection.prototype._activateIsLoadingAdditionalObjs = function() {
+	    if (!this.isLoadingAdditionalObjs()) {
+	      this._isLoadingAdditionalObjs = true;
+	      return this.changed();
+	    }
+	  };
+
+	  return ObjCollection;
+
+	})(Listenable);
+
+	module.exports = ObjCollection;
 
 
 /***/ },
-/* 171 */
+/* 170 */
 /***/ function(module, exports) {
 
 	var Obj;
@@ -20282,21 +20245,91 @@
 	module.exports = Obj;
 
 
+/***/ },
+/* 171 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var Deleter, QueryBuilder;
+
+	QueryBuilder = __webpack_require__(172);
+
+	Deleter = (function() {
+	  Deleter.prototype.MAX_RETRY = 5;
+
+	  Deleter.prototype.TIMEOUT = 500;
+
+	  function Deleter(objId) {
+	    this.objId = objId;
+	    this._promise = $.Deferred();
+	  }
+
+	  Deleter.prototype.deleteObj = function() {
+	    scrivito.delete_obj(this.objId).then((function(_this) {
+	      return function() {
+	        return _this._checkDelete();
+	      };
+	    })(this), (function(_this) {
+	      return function() {
+	        return _this._promise.reject();
+	      };
+	    })(this));
+	    return this._promise;
+	  };
+
+	  Deleter.prototype._checkDelete = function(retryCount) {
+	    if (retryCount == null) {
+	      retryCount = 0;
+	    }
+	    return QueryBuilder.byId(this.objId).load_batch().then(((function(_this) {
+	      return function(searchResult) {
+	        if (searchResult.hits.length === 0) {
+	          return _this._promise.resolve();
+	        } else {
+	          return _this._reCheck(retryCount, function() {
+	            return _this._checkDelete(retryCount + 1);
+	          });
+	        }
+	      };
+	    })(this)));
+	  };
+
+	  Deleter.prototype._reCheck = function(retryCount, fetchObjFunction) {
+	    if (retryCount < this.MAX_RETRY) {
+	      return window.setTimeout(fetchObjFunction, this.TIMEOUT);
+	    } else {
+	      return this._promise.reject();
+	    }
+	  };
+
+	  return Deleter;
+
+	})();
+
+	module.exports = Deleter;
+
+
 /***/ },
 /* 172 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var ActiveNodeConfigCollector, NullQuery, QueryBuilder;
+	var ASC_SORT_ORDER, ActiveNodeConfigCollector, DESC_SORT_ORDER, NullQuery, QueryBuilder, _ref;
 
 	ActiveNodeConfigCollector = __webpack_require__(173);
 
 	NullQuery = __webpack_require__(175);
 
+	_ref = __webpack_require__(166), DESC_SORT_ORDER = _ref.DESC_SORT_ORDER, ASC_SORT_ORDER = _ref.ASC_SORT_ORDER;
+
 	QueryBuilder = (function() {
-	  function QueryBuilder(filter, baseQuery, tags) {
+	  function QueryBuilder(filter, baseQuery, tags, sortCriteria) {
 	    this.filter = filter;
 	    this.tags = tags;
+	    this.sortCriteria = sortCriteria;
 	    this._collector = new ActiveNodeConfigCollector(this.filter);
+	    this.sortCriteria || (this.sortCriteria = {
+	      sortField: '_last_changed',
+	      sortDirection: DESC_SORT_ORDER
+	    });
 	    if (baseQuery) {
 	      this._baseQuery = QueryBuilder.prepareQuery(baseQuery);
 	    }
@@ -20321,11 +20354,11 @@
 	  };
 
 	  QueryBuilder.prototype._addFilterQueries = function(baseQuery) {
-	    var activeConfig, combinedQuery, searchQuery, _i, _len, _ref;
+	    var activeConfig, combinedQuery, searchQuery, _i, _len, _ref1;
 	    combinedQuery = baseQuery;
-	    _ref = this._collector.findActiveFilterItems();
-	    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-	      activeConfig = _ref[_i];
+	    _ref1 = this._collector.findActiveFilterItems();
+	    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+	      activeConfig = _ref1[_i];
 	      searchQuery = this._buildActiveChildrenSearchQuery(activeConfig);
 	      if (searchQuery) {
 	        combinedQuery = this._addOrCreateQuery(combinedQuery, searchQuery);
@@ -20336,8 +20369,8 @@
 
 	  QueryBuilder.prototype._sortQuery = function(query) {
 	    if ((query != null) && this._needOrder()) {
-	      query = query.order(this.filter.sortCriteria.type());
-	      if (this.filter.sortCriteria.isReverse()) {
+	      query = query.order(this.sortCriteria.sortField);
+	      if (this.sortCriteria.sortDirection === DESC_SORT_ORDER) {
 	        if (!query.orderReversed) {
 	          query.reverse_order();
 	        }
@@ -20347,13 +20380,17 @@
 	  };
 
 	  QueryBuilder.prototype._needOrder = function() {
-	    return this.filter.sortCriteria.type() !== "relevance";
+	    return this.sortCriteria.sortField !== "relevance";
 	  };
 
 	  QueryBuilder.prototype._addSearchTermQuery = function(query) {
 	    var searchQuery;
 	    if (this.filter.searchTerm && this.filter.searchTerm.length > 0) {
 	      searchQuery = scrivito.obj_where('*', 'contains_prefix', this.filter.searchTerm);
+	      this.sortCriteria = {
+	        sortField: "relevance",
+	        sortDirection: ASC_SORT_ORDER
+	      };
 	      return this._addOrCreateQuery(query, searchQuery);
 	    } else {
 	      return query;
@@ -20517,501 +20554,90 @@
 	  ActiveNodeConfig.prototype.field = function() {
 	    return this._findConfig('field');
 	  };
-
-	  ActiveNodeConfig.prototype.hasField = function() {
-	    return !!this.field();
-	  };
-
-	  ActiveNodeConfig.prototype.preventsCreation = function() {
-	    return this.nodesPreventingCreation().length > 0;
-	  };
-
-	  ActiveNodeConfig.prototype.nodesPreventingCreation = function() {
-	    return _.select(this.activeNodes(), function(node) {
-	      return node.enable_create === false;
-	    });
-	  };
-
-	  ActiveNodeConfig.prototype.enablesCreation = function() {
-	    return _.some(this.activeNodes(), function(node) {
-	      return node.enable_create === true;
-	    });
-	  };
-
-	  ActiveNodeConfig.prototype.operator = function() {
-	    return this._findConfig('operator') || 'equals';
-	  };
-
-	  ActiveNodeConfig.prototype._valueForNode = function(node) {
-	    return node.value || node.name;
-	  };
-
-	  ActiveNodeConfig.prototype._findConfig = function(attrName) {
-	    var activeNode, parentWithAttribute;
-	    activeNode = this._activeNodes[0];
-	    if (this._filter().type !== 'checkbox' && activeNode[attrName]) {
-	      return activeNode[attrName];
-	    } else {
-	      parentWithAttribute = _.find(this._parents, function(node) {
-	        return node[attrName];
-	      });
-	      return parentWithAttribute && parentWithAttribute[attrName];
-	    }
-	  };
-
-	  ActiveNodeConfig.prototype._filter = function() {
-	    return _.last(this._parents);
-	  };
-
-	  return ActiveNodeConfig;
-
-	})();
-
-	module.exports = ActiveNodeConfig;
-
-
-/***/ },
-/* 175 */
-/***/ function(module, exports) {
-
-	var NullQuery;
-
-	NullQuery = (function() {
-	  function NullQuery() {}
-
-	  NullQuery.prototype.load_batch = function() {
-	    return $.Deferred().resolve({
-	      hits: []
-	    });
-	  };
-
-	  return NullQuery;
-
-	})();
-
-	module.exports = NullQuery;
-
-
-/***/ },
-/* 176 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var Fetcher, FetcherStatus, Listenable, QueryBuilder,
-	  __hasProp = {}.hasOwnProperty,
-	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-	QueryBuilder = __webpack_require__(172);
-
-	Listenable = __webpack_require__(158);
-
-	FetcherStatus = __webpack_require__(177);
-
-	Fetcher = (function(_super) {
-	  __extends(Fetcher, _super);
-
-	  Fetcher.prototype.MAX_RETRY = 2;
-
-	  Fetcher.prototype.status = function() {
-	    return this._fetcherStatus.status();
-	  };
-
-	  function Fetcher() {
-	    Fetcher.__super__.constructor.call(this);
-	    this._fetcherStatus = new FetcherStatus();
-	  }
-
-	  Fetcher.prototype.obj = function() {
-	    return this._obj;
-	  };
-
-	  Fetcher.prototype.fail = function() {
-	    this._fetcherStatus.fail();
-	    return this.changed();
-	  };
-
-	  Fetcher.prototype.complete = function() {
-	    this._fetcherStatus.complete();
-	    return this.changed();
-	  };
-
-	  Fetcher.prototype.fetch = function(id, retryCount) {
-	    if (retryCount == null) {
-	      retryCount = 0;
-	    }
-	    return QueryBuilder.byId(id).load_batch(id).then(((function(_this) {
-	      return function(searchResult) {
-	        if (searchResult.hits.length > 0) {
-	          _this._obj = searchResult.hits[0];
-	          return _this.complete();
-	        } else {
-	          return _this._objNotYetIndexed(retryCount, function() {
-	            return _this.fetch(id, retryCount + 1);
-	          });
-	        }
-	      };
-	    })(this)), (function(_this) {
-	      return function() {
-	        return _this.fail();
-	      };
-	    })(this));
-	  };
-
-	  Fetcher.prototype._objNotYetIndexed = function(retryCount, fetchObjFunction) {
-	    if (retryCount < this.MAX_RETRY) {
-	      return window.setTimeout(fetchObjFunction, 500);
-	    } else {
-	      this.fail();
-	      return $.Deferred().reject();
-	    }
-	  };
-
-	  return Fetcher;
-
-	})(Listenable);
-
-	module.exports = Fetcher;
-
-
-/***/ },
-/* 177 */
-/***/ function(module, exports) {
-
-	var FetcherStatus;
-
-	FetcherStatus = (function() {
-	  FetcherStatus.prototype.status = function() {
-	    return this._status;
-	  };
-
-	  function FetcherStatus() {
-	    this._status = 'active';
-	  }
-
-	  FetcherStatus.prototype.fail = function() {
-	    return this._status = 'failed';
-	  };
-
-	  FetcherStatus.prototype.complete = function() {
-	    return this._status = 'completed';
-	  };
-
-	  return FetcherStatus;
-
-	})();
-
-	module.exports = FetcherStatus;
-
-
-/***/ },
-/* 178 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var Deleter, Listenable, Obj, ObjCollection, SortCriteria,
-	  __hasProp = {}.hasOwnProperty,
-	  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-	Listenable = __webpack_require__(158);
-
-	Obj = __webpack_require__(171);
-
-	SortCriteria = __webpack_require__(159);
-
-	Deleter = __webpack_require__(179);
-
-	ObjCollection = (function(_super) {
-	  __extends(ObjCollection, _super);
-
-	  function ObjCollection(selectedObjsIds, _selectionMode, objs, sortCriteria) {
-	    this._selectionMode = _selectionMode;
-	    ObjCollection.__super__.constructor.call(this);
-	    this._selectionMode || (this._selectionMode = 'multi');
-	    sortCriteria || (sortCriteria = new SortCriteria());
-	    this._sortCriteria = sortCriteria;
-	    this._selectedObjsIds = selectedObjsIds || [];
-	    this._objs = objs || [];
-	    this._isAlreadyReversed = false;
-	    this._curQueryNumber = 0;
-	  }
-
-	  ObjCollection.prototype.objs = function() {
-	    return this._objs;
-	  };
-
-	  ObjCollection.prototype.hasMoreItems = function() {
-	    return this._nextQuery != null;
-	  };
-
-	  ObjCollection.prototype.selectedObjsIds = function() {
-	    return this._selectedObjsIds;
-	  };
-
-	  ObjCollection.prototype.isSingleElementSelected = function() {
-	    return this.getSelectedObjs().length === 1;
-	  };
-
-	  ObjCollection.prototype.getSelectedObjs = function() {
-	    var selectedObjs;
-	    selectedObjs = [];
-	    _.each(this._selectedObjsIds, (function(_this) {
-	      return function(selected) {
-	        var selectedObj;
-	        selectedObj = _.find(_this._objs, function(obj) {
-	          if (obj != null) {
-	            return obj.id() === selected;
-	          }
-	        });
-	        if (selectedObj != null) {
-	          return selectedObjs.push(selectedObj);
-	        }
-	      };
-	    })(this));
-	    return selectedObjs;
-	  };
-
-	  ObjCollection.prototype.deselectObjs = function() {
-	    return this._selectedObjsIds = [];
-	  };
-
-	  ObjCollection.prototype.isLoading = function() {
-	    return !!this._isLoading;
-	  };
-
-	  ObjCollection.prototype.isLoadingAdditionalObjs = function() {
-	    return !!this._isLoadingAdditionalObjs;
-	  };
-
-	  ObjCollection.prototype.reload = function() {
-	    if (this._query) {
-	      return this.loadFromBackend(this._query);
-	    }
-	  };
-
-	  ObjCollection.prototype.setObjs = function(objs) {
-	    this._objs = objs;
-	    return this._resetObjsCollectionParams();
-	  };
-
-	  ObjCollection.prototype.reset = function() {
-	    this._objs = [];
-	    return this._resetObjsCollectionParams();
-	  };
-
-	  ObjCollection.prototype.isSingleSelectionMode = function() {
-	    return this._selectionMode === 'single';
-	  };
-
-	  ObjCollection.prototype.loadFromBackend = function(query) {
-	    this._query = query;
-	    this._curQueryNumber += 1;
-	    this._resetLoadingState();
-	    if (query) {
-	      this._activateLoading();
-	      return this._initialLoadObjs(query, this._curQueryNumber);
-	    } else {
-	      this._objs = [];
-	      return this.changed();
-	    }
-	  };
-
-	  ObjCollection.prototype.toggleSelected = function(objId) {
-	    if (this.isSelected(objId)) {
-	      this._selectedObjsIds = _.without(this._selectedObjsIds, objId);
-	    } else {
-	      if (this.isSingleSelectionMode()) {
-	        this._selectedObjsIds = [objId];
-	      } else {
-	        this._selectedObjsIds.push(objId);
-	      }
-	    }
-	    return this.changed();
-	  };
-
-	  ObjCollection.prototype.isSelected = function(objId) {
-	    return _.contains(this._selectedObjsIds, objId);
-	  };
-
-	  ObjCollection.prototype.loadNextPage = function() {
-	    var queryNumber;
-	    if (this.hasMoreItems() && !this.isLoadingAdditionalObjs()) {
-	      this._activateIsLoadingAdditionalObjs();
-	      queryNumber = this._curQueryNumber;
-	      return this._nextQuery.load_batch().done((function(_this) {
-	        return function(results, next) {
-	          return _this._setAndLoadObjs(results, next, queryNumber);
-	        };
-	      })(this)).fail((function(_this) {
-	        return function() {
-	          _this._isLoadingAdditionalObjs = false;
-	          return _this.changed();
-	        };
-	      })(this));
-	    }
-	  };
-
-	  ObjCollection.prototype.destroySelectedObjs = function() {
-	    var deferreds;
-	    if (this._selectedObjsIds.length > 0) {
-	      deferreds = _.map(this._selectedObjsIds, (function(_this) {
-	        return function(objId) {
-	          return _this._destroyById(objId);
-	        };
-	      })(this));
-	      $.when.apply($, deferreds).always((function(_this) {
-	        return function() {
-	          return _this.reload();
-	        };
-	      })(this));
-	      return this._activateLoading();
-	    }
-	  };
-
-	  ObjCollection.prototype._destroyById = function(objId) {
-	    var deleter;
-	    deleter = new Deleter(objId);
-	    return deleter.deleteObj().always((function(_this) {
-	      return function() {
-	        _this._objs = _this._objs.filter(function(obj) {
-	          return obj.id() !== objId;
-	        });
-	        _this._selectedObjsIds = _this._selectedObjsIds.filter(function(selectedObjId) {
-	          return selectedObjId !== objId;
-	        });
-	        return _this.trigger('destroy-obj', objId);
-	      };
-	    })(this));
-	  };
-
-	  ObjCollection.prototype._resetLoadingState = function() {
-	    this._nextQuery = null;
-	    this._isLoadingAdditionalObjs = false;
-	    return this._isLoading = false;
-	  };
-
-	  ObjCollection.prototype._initialLoadObjs = function(query, queryNumber) {
-	    return query.load_batch().then((function(_this) {
-	      return function(results, next) {
-	        _this._isLoading = false;
-	        if (queryNumber === _this._curQueryNumber) {
-	          _this._objs = [];
-	          return _this._setAndLoadObjs(results, next, queryNumber);
-	        }
-	      };
-	    })(this));
-	  };
-
-	  ObjCollection.prototype._setAndLoadObjs = function(results, next, queryNumber) {
-	    var curObjs;
-	    if (queryNumber === this._curQueryNumber) {
-	      this._isLoadingAdditionalObjs = false;
-	      curObjs = _.map(results.hits, function(attr) {
-	        return new Obj(attr);
-	      });
-	      this._objs = this._objs.concat(curObjs);
-	      this._nextQuery = next;
-	      return this.changed();
-	    }
-	  };
-
-	  ObjCollection.prototype._activateLoading = function() {
-	    if (!this.isLoading()) {
-	      this._isLoading = true;
-	      return this.changed();
-	    }
+
+	  ActiveNodeConfig.prototype.hasField = function() {
+	    return !!this.field();
 	  };
 
-	  ObjCollection.prototype._resetObjsCollectionParams = function() {
-	    this._query = null;
-	    this.deselectObjs();
-	    this._resetLoadingState();
-	    return this.changed();
+	  ActiveNodeConfig.prototype.preventsCreation = function() {
+	    return this.nodesPreventingCreation().length > 0;
 	  };
 
-	  ObjCollection.prototype._activateIsLoadingAdditionalObjs = function() {
-	    if (!this.isLoadingAdditionalObjs()) {
-	      this._isLoadingAdditionalObjs = true;
-	      return this.changed();
-	    }
+	  ActiveNodeConfig.prototype.nodesPreventingCreation = function() {
+	    return _.select(this.activeNodes(), function(node) {
+	      return node.enable_create === false;
+	    });
 	  };
 
-	  return ObjCollection;
+	  ActiveNodeConfig.prototype.enablesCreation = function() {
+	    return _.some(this.activeNodes(), function(node) {
+	      return node.enable_create === true;
+	    });
+	  };
 
-	})(Listenable);
+	  ActiveNodeConfig.prototype.operator = function() {
+	    return this._findConfig('operator') || 'equals';
+	  };
 
-	module.exports = ObjCollection;
+	  ActiveNodeConfig.prototype._valueForNode = function(node) {
+	    return node.value || node.name;
+	  };
 
+	  ActiveNodeConfig.prototype._findConfig = function(attrName) {
+	    var activeNode, parentWithAttribute;
+	    activeNode = this._activeNodes[0];
+	    if (this._filter().type !== 'checkbox' && activeNode[attrName]) {
+	      return activeNode[attrName];
+	    } else {
+	      parentWithAttribute = _.find(this._parents, function(node) {
+	        return node[attrName];
+	      });
+	      return parentWithAttribute && parentWithAttribute[attrName];
+	    }
+	  };
 
-/***/ },
-/* 179 */
-/***/ function(module, exports, __webpack_require__) {
+	  ActiveNodeConfig.prototype._filter = function() {
+	    return _.last(this._parents);
+	  };
 
-	var Deleter, QueryBuilder;
+	  return ActiveNodeConfig;
 
-	QueryBuilder = __webpack_require__(172);
+	})();
 
-	Deleter = (function() {
-	  Deleter.prototype.MAX_RETRY = 5;
+	module.exports = ActiveNodeConfig;
 
-	  Deleter.prototype.TIMEOUT = 500;
 
-	  function Deleter(objId) {
-	    this.objId = objId;
-	    this._promise = $.Deferred();
-	  }
+/***/ },
+/* 175 */
+/***/ function(module, exports) {
 
-	  Deleter.prototype.deleteObj = function() {
-	    scrivito.delete_obj(this.objId).then((function(_this) {
-	      return function() {
-	        return _this._checkDelete();
-	      };
-	    })(this), (function(_this) {
-	      return function() {
-	        return _this._promise.reject();
-	      };
-	    })(this));
-	    return this._promise;
-	  };
+	var NullQuery;
 
-	  Deleter.prototype._checkDelete = function(retryCount) {
-	    if (retryCount == null) {
-	      retryCount = 0;
-	    }
-	    return QueryBuilder.byId(this.objId).load_batch().then(((function(_this) {
-	      return function(searchResult) {
-	        if (searchResult.hits.length === 0) {
-	          return _this._promise.resolve();
-	        } else {
-	          return _this._reCheck(retryCount, function() {
-	            return _this._checkDelete(retryCount + 1);
-	          });
-	        }
-	      };
-	    })(this)));
-	  };
+	NullQuery = (function() {
+	  function NullQuery() {}
 
-	  Deleter.prototype._reCheck = function(retryCount, fetchObjFunction) {
-	    if (retryCount < this.MAX_RETRY) {
-	      return window.setTimeout(fetchObjFunction, this.TIMEOUT);
-	    } else {
-	      return this._promise.reject();
-	    }
+	  NullQuery.prototype.load_batch = function() {
+	    return $.Deferred().resolve({
+	      hits: []
+	    });
 	  };
 
-	  return Deleter;
+	  return NullQuery;
 
 	})();
 
-	module.exports = Deleter;
+	module.exports = NullQuery;
 
 
 /***/ },
-/* 180 */
+/* 176 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ActiveNodeConfigCollector, SortMenu, TopBar, ViewModeBar;
 
-	ViewModeBar = __webpack_require__(181);
+	ViewModeBar = __webpack_require__(177);
 
-	SortMenu = __webpack_require__(203);
+	SortMenu = __webpack_require__(199);
 
 	ActiveNodeConfigCollector = __webpack_require__(173);
 
@@ -21092,6 +20718,8 @@
 	    }, "Search")), React.createElement(ViewModeBar, {
 	      "viewMode": this.props.viewMode
 	    }), React.createElement(SortMenu, {
+	      "dispatch": this.props.dispatch,
+	      "sortCriteria": this.props.sortCriteria,
 	      "filter": this.props.filter
 	    }));
 	  }
@@ -21102,16 +20730,16 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 181 */
+/* 177 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ReactRedux, TABLE_VIEW, THUMBNAIL_VIEW, ViewModeBar, ViewModeBarItem, setViewMode, _ref;
 
-	ReactRedux = __webpack_require__(182);
+	ReactRedux = __webpack_require__(178);
 
-	ViewModeBarItem = __webpack_require__(201);
+	ViewModeBarItem = __webpack_require__(197);
 
-	_ref = __webpack_require__(202), THUMBNAIL_VIEW = _ref.THUMBNAIL_VIEW, TABLE_VIEW = _ref.TABLE_VIEW, setViewMode = _ref.setViewMode;
+	_ref = __webpack_require__(198), THUMBNAIL_VIEW = _ref.THUMBNAIL_VIEW, TABLE_VIEW = _ref.TABLE_VIEW, setViewMode = _ref.setViewMode;
 
 	ViewModeBar = React.createClass({
 	  displayName: 'ViewModeBar',
@@ -21144,7 +20772,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 182 */
+/* 178 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21157,7 +20785,7 @@
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _componentsCreateAll = __webpack_require__(183);
+	var _componentsCreateAll = __webpack_require__(179);
 
 	var _componentsCreateAll2 = _interopRequireDefault(_componentsCreateAll);
 
@@ -21169,7 +20797,7 @@
 	exports.connect = connect;
 
 /***/ },
-/* 183 */
+/* 179 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21179,11 +20807,11 @@
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	var _createProvider = __webpack_require__(184);
+	var _createProvider = __webpack_require__(180);
 
 	var _createProvider2 = _interopRequireDefault(_createProvider);
 
-	var _createConnect = __webpack_require__(186);
+	var _createConnect = __webpack_require__(182);
 
 	var _createConnect2 = _interopRequireDefault(_createConnect);
 
@@ -21197,7 +20825,7 @@
 	module.exports = exports['default'];
 
 /***/ },
-/* 184 */
+/* 180 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21214,7 +20842,7 @@
 
 	function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-	var _utilsCreateStoreShape = __webpack_require__(185);
+	var _utilsCreateStoreShape = __webpack_require__(181);
 
 	var _utilsCreateStoreShape2 = _interopRequireDefault(_utilsCreateStoreShape);
 
@@ -21329,7 +20957,7 @@
 	module.exports = exports['default'];
 
 /***/ },
-/* 185 */
+/* 181 */
 /***/ function(module, exports) {
 
 	"use strict";
@@ -21348,7 +20976,7 @@
 	module.exports = exports["default"];
 
 /***/ },
-/* 186 */
+/* 182 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21367,23 +20995,23 @@
 
 	function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-	var _utilsCreateStoreShape = __webpack_require__(185);
+	var _utilsCreateStoreShape = __webpack_require__(181);
 
 	var _utilsCreateStoreShape2 = _interopRequireDefault(_utilsCreateStoreShape);
 
-	var _utilsShallowEqual = __webpack_require__(187);
+	var _utilsShallowEqual = __webpack_require__(183);
 
 	var _utilsShallowEqual2 = _interopRequireDefault(_utilsShallowEqual);
 
-	var _utilsIsPlainObject = __webpack_require__(188);
+	var _utilsIsPlainObject = __webpack_require__(184);
 
 	var _utilsIsPlainObject2 = _interopRequireDefault(_utilsIsPlainObject);
 
-	var _utilsWrapActionCreators = __webpack_require__(189);
+	var _utilsWrapActionCreators = __webpack_require__(185);
 
 	var _utilsWrapActionCreators2 = _interopRequireDefault(_utilsWrapActionCreators);
 
-	var _invariant = __webpack_require__(200);
+	var _invariant = __webpack_require__(196);
 
 	var _invariant2 = _interopRequireDefault(_invariant);
 
@@ -21622,7 +21250,7 @@
 	module.exports = exports['default'];
 
 /***/ },
-/* 187 */
+/* 183 */
 /***/ function(module, exports) {
 
 	"use strict";
@@ -21656,7 +21284,7 @@
 	module.exports = exports["default"];
 
 /***/ },
-/* 188 */
+/* 184 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -21691,7 +21319,7 @@
 	module.exports = exports['default'];
 
 /***/ },
-/* 189 */
+/* 185 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21699,7 +21327,7 @@
 	exports.__esModule = true;
 	exports['default'] = wrapActionCreators;
 
-	var _redux = __webpack_require__(190);
+	var _redux = __webpack_require__(186);
 
 	function wrapActionCreators(actionCreators) {
 	  return function (dispatch) {
@@ -21710,7 +21338,7 @@
 	module.exports = exports['default'];
 
 /***/ },
-/* 190 */
+/* 186 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21718,27 +21346,27 @@
 	exports.__esModule = true;
 	exports.compose = exports.applyMiddleware = exports.bindActionCreators = exports.combineReducers = exports.createStore = undefined;
 
-	var _createStore = __webpack_require__(191);
+	var _createStore = __webpack_require__(187);
 
 	var _createStore2 = _interopRequireDefault(_createStore);
 
-	var _combineReducers = __webpack_require__(195);
+	var _combineReducers = __webpack_require__(191);
 
 	var _combineReducers2 = _interopRequireDefault(_combineReducers);
 
-	var _bindActionCreators = __webpack_require__(197);
+	var _bindActionCreators = __webpack_require__(193);
 
 	var _bindActionCreators2 = _interopRequireDefault(_bindActionCreators);
 
-	var _applyMiddleware = __webpack_require__(198);
+	var _applyMiddleware = __webpack_require__(194);
 
 	var _applyMiddleware2 = _interopRequireDefault(_applyMiddleware);
 
-	var _compose = __webpack_require__(199);
+	var _compose = __webpack_require__(195);
 
 	var _compose2 = _interopRequireDefault(_compose);
 
-	var _warning = __webpack_require__(196);
+	var _warning = __webpack_require__(192);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
@@ -21761,7 +21389,7 @@
 	exports.compose = _compose2["default"];
 
 /***/ },
-/* 191 */
+/* 187 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21770,7 +21398,7 @@
 	exports.ActionTypes = undefined;
 	exports["default"] = createStore;
 
-	var _isPlainObject = __webpack_require__(192);
+	var _isPlainObject = __webpack_require__(188);
 
 	var _isPlainObject2 = _interopRequireDefault(_isPlainObject);
 
@@ -21982,11 +21610,11 @@
 	}
 
 /***/ },
-/* 192 */
+/* 188 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var isHostObject = __webpack_require__(193),
-	    isObjectLike = __webpack_require__(194);
+	var isHostObject = __webpack_require__(189),
+	    isObjectLike = __webpack_require__(190);
 
 	/** `Object#toString` result references. */
 	var objectTag = '[object Object]';
@@ -22056,7 +21684,7 @@
 
 
 /***/ },
-/* 193 */
+/* 189 */
 /***/ function(module, exports) {
 
 	/**
@@ -22082,7 +21710,7 @@
 
 
 /***/ },
-/* 194 */
+/* 190 */
 /***/ function(module, exports) {
 
 	/**
@@ -22116,7 +21744,7 @@
 
 
 /***/ },
-/* 195 */
+/* 191 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -22124,13 +21752,13 @@
 	exports.__esModule = true;
 	exports["default"] = combineReducers;
 
-	var _createStore = __webpack_require__(191);
+	var _createStore = __webpack_require__(187);
 
-	var _isPlainObject = __webpack_require__(192);
+	var _isPlainObject = __webpack_require__(188);
 
 	var _isPlainObject2 = _interopRequireDefault(_isPlainObject);
 
-	var _warning = __webpack_require__(196);
+	var _warning = __webpack_require__(192);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
@@ -22248,7 +21876,7 @@
 	}
 
 /***/ },
-/* 196 */
+/* 192 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -22277,7 +21905,7 @@
 	}
 
 /***/ },
-/* 197 */
+/* 193 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -22333,7 +21961,7 @@
 	}
 
 /***/ },
-/* 198 */
+/* 194 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -22343,7 +21971,7 @@
 	exports.__esModule = true;
 	exports["default"] = applyMiddleware;
 
-	var _compose = __webpack_require__(199);
+	var _compose = __webpack_require__(195);
 
 	var _compose2 = _interopRequireDefault(_compose);
 
@@ -22395,7 +22023,7 @@
 	}
 
 /***/ },
-/* 199 */
+/* 195 */
 /***/ function(module, exports) {
 
 	"use strict";
@@ -22429,7 +22057,7 @@
 	}
 
 /***/ },
-/* 200 */
+/* 196 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -22486,14 +22114,14 @@
 
 
 /***/ },
-/* 201 */
+/* 197 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ObjDisplayActionCreator, ReactRedux, ViewModeBarItem;
 
-	ReactRedux = __webpack_require__(182);
+	ReactRedux = __webpack_require__(178);
 
-	ObjDisplayActionCreator = __webpack_require__(202);
+	ObjDisplayActionCreator = __webpack_require__(198);
 
 	ViewModeBarItem = React.createClass({
 	  displayName: 'ViewModeBarItem',
@@ -22541,7 +22169,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 202 */
+/* 198 */
 /***/ function(module, exports) {
 
 	var ObjDisplayActionCreator;
@@ -22570,12 +22198,16 @@
 
 
 /***/ },
-/* 203 */
+/* 199 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var SortMenu, SortMenuItem;
+	/* WEBPACK VAR INJECTION */(function(React) {var ASC_SORT_ORDER, DESC_SORT_ORDER, ReactRedux, SortMenu, SortMenuItem, sortInAscOrder, sortInDescOrder, _ref;
 
-	SortMenuItem = __webpack_require__(204);
+	SortMenuItem = __webpack_require__(200);
+
+	ReactRedux = __webpack_require__(178);
+
+	_ref = __webpack_require__(166), sortInAscOrder = _ref.sortInAscOrder, sortInDescOrder = _ref.sortInDescOrder, DESC_SORT_ORDER = _ref.DESC_SORT_ORDER, ASC_SORT_ORDER = _ref.ASC_SORT_ORDER;
 
 	SortMenu = React.createClass({
 	  displayName: 'SortMenu',
@@ -22585,6 +22217,12 @@
 	      ascCriteriaTitle: "Relevance",
 	      sortItemType: "relevance"
 	    },
+	    "filename": {
+	      itemTitle: "Sort by filename",
+	      descCriteriaTitle: "Filename: From Z to A",
+	      ascCriteriaTitle: "Filename: From A to Z",
+	      sortItemType: "blob:filename"
+	    },
 	    "date": {
 	      itemTitle: "Sort by date",
 	      descCriteriaTitle: "Last change: latest first",
@@ -22595,17 +22233,37 @@
 	  toggleSortMenu: function() {
 	    return $('.scrivito-content-browser-sort-menu .scrivito_menu_box').fadeToggle();
 	  },
+	  getSortActiveCriteriaTitle: function() {
+	    var activeSortCriteriaItem;
+	    activeSortCriteriaItem = _.findWhere(_.values(this.sortItemsData), {
+	      sortItemType: this.props.sortCriteria.sortField
+	    });
+	    if (activeSortCriteriaItem === void 0) {
+	      return;
+	    }
+	    switch (this.props.sortCriteria.sortDirection) {
+	      case DESC_SORT_ORDER:
+	        return activeSortCriteriaItem.descCriteriaTitle;
+	      default:
+	        return activeSortCriteriaItem.ascCriteriaTitle;
+	    }
+	  },
 	  getSortIconClassName: function() {
-	    var sortCriteria, sortIcon;
+	    var sortIcon;
 	    sortIcon = "scrivito_icon ";
-	    sortCriteria = this.props.filter.sortCriteria;
-	    if (sortCriteria.isSortedDesc()) {
-	      sortIcon += "scrivito_icon_sort_down";
-	    } else {
+	    if (this.props.sortCriteria.sortDirection === DESC_SORT_ORDER) {
 	      sortIcon += "scrivito_icon_sort_up";
+	    } else {
+	      sortIcon += "scrivito_icon_sort_down";
 	    }
 	    return sortIcon;
 	  },
+	  setDescSortCriteria: function(type) {
+	    return this.props.dispatch(sortInDescOrder(type, this.props.filter));
+	  },
+	  setAscSortCriteria: function(type) {
+	    return this.props.dispatch(sortInAscOrder(type, this.props.filter));
+	  },
 	  render: function() {
 	    var sortItem;
 	    return React.createElement("span", {
@@ -22613,20 +22271,25 @@
 	      "onClick": this.toggleSortMenu
 	    }, React.createElement("i", {
 	      "className": this.getSortIconClassName()
-	    }), this.props.filter.sortCriteria.activeElement(), React.createElement("i", {
+	    }), React.createElement("span", {
+	      "className": "scrivito-content-browser-sort-menu-title"
+	    }, this.getSortActiveCriteriaTitle()), React.createElement("i", {
 	      "className": "scrivito_icon scrivito-content-browser-menu-icon scrivito_icon_chevron_down"
 	    }), React.createElement("ul", {
 	      "className": "scrivito_menu_box scrivito_left"
 	    }, (function() {
-	      var _i, _len, _ref, _results;
-	      _ref = Object.keys(this.sortItemsData);
+	      var _i, _len, _ref1, _results;
+	      _ref1 = Object.keys(this.sortItemsData);
 	      _results = [];
-	      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-	        sortItem = _ref[_i];
+	      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+	        sortItem = _ref1[_i];
 	        _results.push(React.createElement(SortMenuItem, {
-	          "filter": this.props.filter,
+	          "sortCriteria": this.props.sortCriteria,
 	          "key": sortItem,
-	          "sortItem": this.sortItemsData[sortItem]
+	          "sortItem": this.sortItemsData[sortItem],
+	          "activeTitle": this.getSortActiveCriteriaTitle(),
+	          "setAscSortCriteria": this.setAscSortCriteria,
+	          "setDescSortCriteria": this.setDescSortCriteria
 	        }));
 	      }
 	      return _results;
@@ -22641,12 +22304,10 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 204 */
+/* 200 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var SortCriteria, SortMenuItem;
-
-	SortCriteria = __webpack_require__(159);
+	/* WEBPACK VAR INJECTION */(function(React) {var SortMenuItem;
 
 	SortMenuItem = React.createClass({
 	  displayName: 'SortMenuItem',
@@ -22660,7 +22321,7 @@
 	  getSortLiClassName: function(activeElement) {
 	    var itemIcon;
 	    itemIcon = "scrivito_menu_item";
-	    if (this.props.filter.sortCriteria.activeElement() === activeElement) {
+	    if (this.props.activeTitle === activeElement) {
 	      itemIcon += " active";
 	    }
 	    return itemIcon;
@@ -22674,16 +22335,11 @@
 	  currentSortItem: function() {
 	    return this.props.sortItem;
 	  },
-	  _changeSortCriteria: function(reverse, activeItemElement) {
-	    var sortCriteria;
-	    sortCriteria = new SortCriteria(this.currentSortItem().sortItemType, reverse, activeItemElement, this.currentSortItem().itemTitle);
-	    return this.props.filter.setSortCriteria(sortCriteria);
-	  },
 	  _sortInAscOrder: function() {
-	    return this._changeSortCriteria(false, this.currentSortItem().ascCriteriaTitle);
+	    return this.props.setAscSortCriteria(this.currentSortItem().sortItemType);
 	  },
 	  _sortInDescOrder: function() {
-	    return this._changeSortCriteria(true, this.currentSortItem().descCriteriaTitle);
+	    return this.props.setDescSortCriteria(this.currentSortItem().sortItemType);
 	  },
 	  render: function() {
 	    return React.createElement("div", null, React.createElement("li", {
@@ -22707,22 +22363,22 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 205 */
+/* 201 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, Filter, FilterMixin, LastAddedFilter, QueryBuilder, SelectedFilter, TreeFilter;
 
-	FilterMixin = __webpack_require__(206);
+	FilterMixin = __webpack_require__(202);
 
-	AdditionalOptionFilter = __webpack_require__(207);
+	AdditionalOptionFilter = __webpack_require__(203);
 
-	TreeFilter = __webpack_require__(214);
+	TreeFilter = __webpack_require__(210);
 
-	SelectedFilter = __webpack_require__(215);
+	SelectedFilter = __webpack_require__(211);
 
 	QueryBuilder = __webpack_require__(172);
 
-	LastAddedFilter = __webpack_require__(216);
+	LastAddedFilter = __webpack_require__(212);
 
 	Filter = React.createClass({
 	  displayName: 'Filter',
@@ -22740,17 +22396,24 @@
 	  _activeTags: function() {
 	    return this._activeTags;
 	  },
+	  _triggerReduxStateChanged: function(newProps, oldProps) {
+	    if (!_.isEqual(newProps, oldProps)) {
+	      return this.props.filter.trigger("reduxStateChanged", this.props.filter);
+	    }
+	  },
 	  componentWillReceiveProps: function(nextProps) {
 	    if (!this.state.selectedFilter) {
-	      this._activeTags = nextProps.activeTags;
-	      if (!_.isEqual(this._activeTags, this.props.activeTags)) {
-	        return this.props.filter.trigger("tagActiveStateChanged", this.props.filter);
+	      this._sortCriteria = nextProps.sortCriteria;
+	      this._triggerReduxStateChanged(this._sortCriteria, this.props.sortCriteria);
+	      if (nextProps.tags.items.length > 0) {
+	        this._activeTags = nextProps.tags.activeTags;
+	        return this._triggerReduxStateChanged(this._activeTags, this.props.tags.activeTags);
 	      }
 	    }
 	  },
 	  _buildQuery: function(filter) {
 	    var queryBder;
-	    queryBder = new QueryBuilder(filter, this.props.baseQuery, this._activeTags);
+	    queryBder = new QueryBuilder(filter, this.props.baseQuery, this._activeTags, this._sortCriteria);
 	    return queryBder.searchRequest();
 	  },
 	  loadObjsByFilterQuery: function(query) {
@@ -22761,9 +22424,6 @@
 	    this.props.objCollection.deselectObjs();
 	    return this.props.objCollection.loadFromBackend(query);
 	  },
-	  addedObjsCollectionCount: function() {
-	    return this.props.addedObjsCollection.count();
-	  },
 	  loadObjs: function(filter) {
 	    var query;
 	    query = this._buildQuery(filter);
@@ -22783,10 +22443,10 @@
 	  getFilterClassName: function() {
 	    var filterBrowserClass;
 	    filterBrowserClass = "scrivito-content-browser-filter";
-	    if (this.addedObjsCollectionCount() > 0 && this.props.standAlone) {
+	    if (this.props.additionCount > 0 && this.props.standAlone) {
 	      return filterBrowserClass;
 	    }
-	    if (this.addedObjsCollectionCount() > 0) {
+	    if (this.props.additionCount > 0) {
 	      filterBrowserClass += " last_added";
 	    }
 	    if (this.props.standAlone) {
@@ -22795,9 +22455,9 @@
 	    return filterBrowserClass;
 	  },
 	  componentDidMount: function() {
-	    this._activeTags = this.props.activeTags;
+	    this._activeTags = this.props.tags.activeTags;
 	    this.props.filter.onChange(this.loadObjsAndTags);
-	    return this.props.filter.on("tagActiveStateChanged", this.loadObjs);
+	    return this.props.filter.on("reduxStateChanged", this.loadObjs);
 	  },
 	  activateInitialFilter: function() {
 	    if (this.props.objCollection.selectedObjsIds().length > 0) {
@@ -22810,8 +22470,9 @@
 	    this.setState({
 	      selectedFilter: false
 	    });
-	    this.props.updateLastAdded(true);
 	    this.props.disableTags();
+	    this.props.updateLastAdded(true);
+	    this.props.objCollection.deselectObjs();
 	    return this.props.filter.deselectHierarchicalFilters();
 	  },
 	  activateSelectedFilter: function() {
@@ -22820,8 +22481,8 @@
 	    this.setState({
 	      selectedFilter: true
 	    });
-	    this.props.updateLastAdded(false);
 	    this.props.disableTags();
+	    this.props.updateLastAdded(false);
 	    query = QueryBuilder.byId(this.props.objCollection.selectedObjsIds());
 	    return this.props.objCollection.loadFromBackend(query);
 	  },
@@ -22856,8 +22517,8 @@
 	      "selectedCount": selectedObjsCount,
 	      "active": this.state.selectedFilter,
 	      "activateSelectedFilter": this.activateSelectedFilter
-	    }) : void 0), (this.addedObjsCollectionCount() > 0 ? React.createElement(LastAddedFilter, {
-	      "addedCount": this.addedObjsCollectionCount(),
+	    }) : void 0), (this.props.additionCount > 0 ? React.createElement(LastAddedFilter, {
+	      "addedCount": this.props.additionCount,
 	      "active": this.props.showLastAdded,
 	      "activateLastAddedFilter": this.activateLastAddedFilter
 	    }) : void 0)), React.createElement("div", {
@@ -22871,7 +22532,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 206 */
+/* 202 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var FilterMixin;
@@ -22894,18 +22555,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 207 */
+/* 203 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, CheckBoxOptionFilter, DeselectAllRadioOptionFilter, ExpandableFilterNodeMixin, RadioOptionFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(208);
+	ExpandableFilterNodeMixin = __webpack_require__(204);
 
-	DeselectAllRadioOptionFilter = __webpack_require__(209);
+	DeselectAllRadioOptionFilter = __webpack_require__(205);
 
-	RadioOptionFilter = __webpack_require__(211);
+	RadioOptionFilter = __webpack_require__(207);
 
-	CheckBoxOptionFilter = __webpack_require__(213);
+	CheckBoxOptionFilter = __webpack_require__(209);
 
 	AdditionalOptionFilter = React.createClass({
 	  displayName: 'AdditionalOptionFilter',
@@ -22961,7 +22622,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 208 */
+/* 204 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin;
@@ -22997,12 +22658,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 209 */
+/* 205 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var DeselectAllRadioOptionFilter, OptionFilterLabelRenderMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(210);
+	OptionFilterLabelRenderMixin = __webpack_require__(206);
 
 	DeselectAllRadioOptionFilter = React.createClass({
 	  displayName: 'DeselectAllRadioOptionFilter',
@@ -23032,7 +22693,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 210 */
+/* 206 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterLabelRenderMixin;
@@ -23050,12 +22711,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 211 */
+/* 207 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterMixin, RadioOptionFilter;
 
-	OptionFilterMixin = __webpack_require__(212);
+	OptionFilterMixin = __webpack_require__(208);
 
 	RadioOptionFilter = React.createClass({
 	  displayName: 'RadioOptionFilter',
@@ -23080,12 +22741,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 212 */
+/* 208 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var OptionFilterLabelRenderMixin, OptionFilterMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(210);
+	OptionFilterLabelRenderMixin = __webpack_require__(206);
 
 	OptionFilterMixin = {
 	  mixins: [OptionFilterLabelRenderMixin],
@@ -23108,12 +22769,12 @@
 
 
 /***/ },
-/* 213 */
+/* 209 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var CheckBoxOptionFilter, OptionFilterMixin;
 
-	OptionFilterMixin = __webpack_require__(212);
+	OptionFilterMixin = __webpack_require__(208);
 
 	CheckBoxOptionFilter = React.createClass({
 	  displayName: 'CheckBoxOptionFilter',
@@ -23133,12 +22794,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 214 */
+/* 210 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin, QueryBuilder, TreeFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(208);
+	ExpandableFilterNodeMixin = __webpack_require__(204);
 
 	QueryBuilder = __webpack_require__(172);
 
@@ -23207,7 +22868,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 215 */
+/* 211 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var SelectedFilter;
@@ -23241,7 +22902,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 216 */
+/* 212 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedFilter;
@@ -23275,26 +22936,28 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 217 */
+/* 213 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var Items, LastAddedItems, PresetBuilder, TableView, TableViewContent, TagBar, ThumbnailItems, objDisplayAction, toggleExpandTagBar, toggleTag, _ref;
+	/* WEBPACK VAR INJECTION */(function(React) {var Items, LastAddedItems, Obj, PresetBuilder, TableView, TableViewContent, TagBar, ThumbnailItems, objDisplayAction, toggleExpandTagBar, toggleTag, _ref;
 
-	TableView = __webpack_require__(218);
+	TableView = __webpack_require__(214);
 
-	ThumbnailItems = __webpack_require__(219);
+	ThumbnailItems = __webpack_require__(215);
 
-	PresetBuilder = __webpack_require__(227);
+	PresetBuilder = __webpack_require__(223);
 
-	LastAddedItems = __webpack_require__(228);
+	LastAddedItems = __webpack_require__(224);
 
-	TableViewContent = __webpack_require__(238);
+	TableViewContent = __webpack_require__(235);
 
-	TagBar = __webpack_require__(240);
+	TagBar = __webpack_require__(237);
 
-	objDisplayAction = __webpack_require__(202);
+	objDisplayAction = __webpack_require__(198);
 
-	_ref = __webpack_require__(241), toggleExpandTagBar = _ref.toggleExpandTagBar, toggleTag = _ref.toggleTag;
+	_ref = __webpack_require__(238), toggleExpandTagBar = _ref.toggleExpandTagBar, toggleTag = _ref.toggleTag;
+
+	Obj = __webpack_require__(170);
 
 	Items = React.createClass({
 	  displayName: 'Items',
@@ -23303,6 +22966,15 @@
 	      dragInProgress: false
 	    };
 	  },
+	  componentWillReceiveProps: function(nextProps) {
+	    var obj;
+	    if (this.props.lastAdded.isVisible && nextProps.lastAdded.lastAddedObj) {
+	      if (this.props.lastAdded.lastAddedObj !== nextProps.lastAdded.lastAddedObj) {
+	        obj = new Obj(nextProps.lastAdded.lastAddedObj);
+	        return this.props.objCollection.toggleSelected(obj);
+	      }
+	    }
+	  },
 	  baseItemsClass: function() {
 	    var baseItemClass;
 	    baseItemClass = "scrivito-content-browser-items";
@@ -23324,7 +22996,7 @@
 	    var className;
 	    className = this.baseItemsClass();
 	    if (this.state.dragInProgress) {
-	      if (this.props.showLastAdded) {
+	      if (this.props.lastAdded.isVisible) {
 	        className += " uploader-drag-over-forbiden";
 	      } else {
 	        className += " uploader-drag-over";
@@ -23358,10 +23030,18 @@
 	      return "\"" + field_name + "\" options";
 	    }
 	  },
+	  _fileAttributes: function(file) {
+	    var objClass;
+	    objClass = scrivito.default_obj_class_for_content_type(file.type);
+	    return {
+	      blob: file,
+	      _obj_class: objClass
+	    };
+	  },
 	  uploadFiles: function(event) {
 	    var dataTransfer, files, preset;
 	    this.changeDragState(false)(event);
-	    if (this.props.showLastAdded) {
+	    if (this.props.lastAdded.isVisible) {
 	      return;
 	    }
 	    dataTransfer = event.dataTransfer;
@@ -23372,7 +23052,15 @@
 	    if (files.length > 0) {
 	      preset = this.buildPreset();
 	      if (preset.isValid()) {
-	        return this.props.addedObjsCollection.addFiles(files, preset.values());
+	        this.props.disableTags();
+	        return _.each(files, (function(_this) {
+	          return function(file) {
+	            var attributes;
+	            attributes = _this._fileAttributes(file);
+	            _this.props.createObj(attributes, _this.props.basePreset, preset.values(), _this.props.tags.activeTags);
+	            return _this.props.filter.deselectHierarchicalFilters();
+	          };
+	        })(this));
 	      } else {
 	        return this._showConflictingPresetsAlert(preset.errors());
 	      }
@@ -23394,34 +23082,43 @@
 	      };
 	    })(this);
 	  },
+	  renderTagBar: function() {
+	    if (this.props.tags.items.length > 0) {
+	      return React.createElement(TagBar, {
+	        "tags": this.props.tags,
+	        "toggleTag": this.toggleTagAction,
+	        "toggleExpandTagBar": this.toggleExpandTagBar
+	      });
+	    }
+	  },
 	  render: function() {
 	    return React.createElement("div", {
 	      "className": this.dropZoneClass(),
 	      "onDragOver": this.changeDragState(true),
 	      "onDrop": this.uploadFiles,
 	      "onDragLeave": this.changeDragState(false)
-	    }, React.createElement(TagBar, {
-	      "tags": this.props.tags,
-	      "toggleTag": this.toggleTagAction,
-	      "toggleExpandTagBar": this.toggleExpandTagBar
-	    }), (this.props.objCollection.isLoading() ? React.createElement("div", {
+	    }, this.renderTagBar(), (this.props.objCollection.isLoading() ? React.createElement("div", {
 	      "className": "scrivito-content-browser-loading"
 	    }, React.createElement("i", {
 	      "className": "scrivito_icon scrivito_icon_refresh"
-	    })) : this.props.showLastAdded || this.props.addedObjsCollection.hasActiveCreations() ? React.createElement(LastAddedItems, React.__spread({}, this.props, {
+	    })) : this.props.lastAdded.isVisible ? React.createElement(LastAddedItems, React.__spread({}, this.props, {
 	      "viewMode": this.props.viewMode,
 	      "dragInProgress": this.state.dragInProgress,
-	      "addedObjsCollection": this.props.addedObjsCollection
+	      "additions": this.props.lastAdded.additions
 	    })) : this.props.viewMode === objDisplayAction.TABLE_VIEW ? React.createElement(TableView, {
 	      "objCollection": this.props.objCollection,
+	      "activeTags": this.props.tags.activeTags,
 	      "toggleSelected": this.props.toggleSelected,
 	      "filter": this.props.filter,
-	      "addedObjsCollection": this.props.addedObjsCollection
+	      "createObj": this.props.createObj,
+	      "basePreset": this.props.basePreset
 	    }, React.createElement(TableViewContent, React.__spread({}, this.props))) : React.createElement(ThumbnailItems, {
 	      "objCollection": this.props.objCollection,
 	      "viewMode": this.props.viewMode,
+	      "activeTags": this.props.tags.activeTags,
+	      "basePreset": this.props.basePreset,
 	      "filter": this.props.filter,
-	      "addedObjsCollection": this.props.addedObjsCollection
+	      "createObj": this.props.createObj
 	    })));
 	  }
 	});
@@ -23431,7 +23128,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 218 */
+/* 214 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var TableView;
@@ -23451,18 +23148,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 219 */
+/* 215 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ActiveNodeConfigCollector, InfiniteScrollMixin, ObjCreation, ReactDOM, ThumbnailAddItem, ThumbnailItem, ThumbnailItems;
 
-	InfiniteScrollMixin = __webpack_require__(220);
+	InfiniteScrollMixin = __webpack_require__(216);
 
-	ThumbnailItem = __webpack_require__(221);
+	ThumbnailItem = __webpack_require__(217);
 
-	ThumbnailAddItem = __webpack_require__(224);
+	ThumbnailAddItem = __webpack_require__(220);
 
-	ObjCreation = __webpack_require__(226);
+	ObjCreation = __webpack_require__(222);
 
 	ActiveNodeConfigCollector = __webpack_require__(173);
 
@@ -23500,8 +23197,14 @@
 	    return React.createElement("ul", {
 	      "className": this.getSizeClassName()
 	    }, (this.objCreation().showCreationItem() ? React.createElement(ThumbnailAddItem, {
+	      "activeTags": this.props.activeTags,
 	      "objCreation": this.objCreation(),
-	      "addedObjsCollection": this.props.addedObjsCollection
+	      "basePreset": true,
+	      "props": true,
+	      "ps": true,
+	      "basePreset": true,
+	      "t": true,
+	      "createObj": this.props.createObj
 	    }) : void 0), this.buildItems());
 	  }
 	});
@@ -23511,7 +23214,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 220 */
+/* 216 */
 /***/ function(module, exports) {
 
 	var InfiniteScrollMixin;
@@ -23578,14 +23281,14 @@
 
 
 /***/ },
-/* 221 */
+/* 217 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, MimeTypeIcon, ThumbnailItem;
 
-	InspectedItemMixin = __webpack_require__(222);
+	InspectedItemMixin = __webpack_require__(218);
 
-	MimeTypeIcon = __webpack_require__(223);
+	MimeTypeIcon = __webpack_require__(219);
 
 	ThumbnailItem = React.createClass({
 	  displayName: 'ThumbnailItem',
@@ -23644,7 +23347,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 222 */
+/* 218 */
 /***/ function(module, exports) {
 
 	var InspectedItemMixin;
@@ -23667,7 +23370,7 @@
 	    return className;
 	  },
 	  handleSelectClick: function() {
-	    return this.props.objCollection.toggleSelected(this.props.obj.id());
+	    return this.props.objCollection.toggleSelected(this.props.obj);
 	  }
 	};
 
@@ -23675,7 +23378,7 @@
 
 
 /***/ },
-/* 223 */
+/* 219 */
 /***/ function(module, exports) {
 
 	var MimeTypeIcon;
@@ -23722,12 +23425,12 @@
 
 
 /***/ },
-/* 224 */
+/* 220 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, ThumbnailAddItem;
 
-	AddItemMixin = __webpack_require__(225);
+	AddItemMixin = __webpack_require__(221);
 
 	ThumbnailAddItem = React.createClass({
 	  displayName: 'ThumbnailAddItem',
@@ -23752,7 +23455,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 225 */
+/* 221 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin;
@@ -23835,7 +23538,7 @@
 	  },
 	  createClick: function() {
 	    if (this.props.objCreation.isActive()) {
-	      return this.props.addedObjsCollection.createObj(this.props.objCreation.preset());
+	      return this.props.createObj(null, this.props.basePreset, this.props.objCreation.preset(), this.props.activeTags);
 	    } else {
 	      return this.showErrorAlert(this.props.objCreation.error());
 	    }
@@ -23847,14 +23550,14 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 226 */
+/* 222 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, ObjCreation, PresetBuilder;
 
 	ActiveNodeConfigCollector = __webpack_require__(173);
 
-	PresetBuilder = __webpack_require__(227);
+	PresetBuilder = __webpack_require__(223);
 
 	ObjCreation = (function() {
 	  function ObjCreation(filter) {
@@ -23934,7 +23637,7 @@
 
 
 /***/ },
-/* 227 */
+/* 223 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, PresetBuilder;
@@ -24030,18 +23733,18 @@
 
 
 /***/ },
-/* 228 */
+/* 224 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItems, LastAddedTableViewContent, LastAddedThumbnailItems, TableView, objDisplayAction;
 
-	LastAddedTableViewContent = __webpack_require__(229);
+	LastAddedTableViewContent = __webpack_require__(225);
 
-	LastAddedThumbnailItems = __webpack_require__(235);
+	LastAddedThumbnailItems = __webpack_require__(232);
 
-	TableView = __webpack_require__(218);
+	TableView = __webpack_require__(214);
 
-	objDisplayAction = __webpack_require__(202);
+	objDisplayAction = __webpack_require__(198);
 
 	LastAddedItems = React.createClass({
 	  displayName: 'LastAddedItems',
@@ -24064,39 +23767,47 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 229 */
+/* 225 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedTableViewContent, LastAddedTableViewErrorItem, LastAddedTableViewItem, TableViewItem;
+	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedTableViewContent, LastAddedTableViewErrorItem, LastAddedTableViewItem, Obj, TableViewItem, failed, isActive, isCompleted, _ref;
+
+	LastAddedTableViewErrorItem = __webpack_require__(226);
 
-	LastAddedTableViewErrorItem = __webpack_require__(230);
+	LastAddedTableViewItem = __webpack_require__(228);
 
-	LastAddedTableViewItem = __webpack_require__(232);
+	TableViewItem = __webpack_require__(231);
 
-	TableViewItem = __webpack_require__(234);
+	Obj = __webpack_require__(170);
+
+	_ref = __webpack_require__(230), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
 
 	LastAddedTableViewContent = React.createClass({
 	  displayName: 'LastAddedTableViewContent',
 	  renderedLastAddedErrorThumbComponent: function() {
-	    if (this.props.addedObjsCollection.hasFailedCreations()) {
+	    var failedAdditions;
+	    failedAdditions = failed(this.props.additions);
+	    if (failedAdditions.length) {
 	      return React.createElement(LastAddedTableViewErrorItem, {
-	        "addedObjsCollection": this.props.addedObjsCollection
+	        "failedAdditions": failedAdditions
 	      });
 	    }
 	  },
 	  getLastAddedTableViewItems: function() {
 	    var items;
-	    return items = _.map(this.props.addedObjsCollection.objs(), (function(_this) {
-	      return function(obj) {
-	        if (obj.status() === "active") {
+	    return items = _.map(this.props.additions, (function(_this) {
+	      return function(addition) {
+	        var obj;
+	        if (isActive(addition)) {
 	          return React.createElement(LastAddedTableViewItem, {
-	            "key": obj.uniqueId(),
-	            "addedItem": obj
+	            "key": addition.additionId,
+	            "addedItem": addition
 	          });
-	        } else if (obj.status() === "completed") {
+	        } else if (isCompleted(addition)) {
+	          obj = new Obj(addition.obj);
 	          return React.createElement(TableViewItem, {
-	            "key": obj.createdObj().id(),
-	            "obj": obj.createdObj(),
+	            "key": obj.id(),
+	            "obj": obj,
 	            "objCollection": _this.props.objCollection
 	          });
 	        }
@@ -24115,12 +23826,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 230 */
+/* 226 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedTableViewErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(231);
+	LastAddedErrorItemMixin = __webpack_require__(227);
 
 	LastAddedTableViewErrorItem = React.createClass({
 	  displayName: 'LastAddedTableViewError',
@@ -24143,20 +23854,19 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 231 */
+/* 227 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin;
 
 	LastAddedErrorItemMixin = {
 	  failureMessage: function() {
-	    var defaultError, failedObjs, message;
+	    var defaultError, message;
 	    defaultError = "Upload failed. Please check your network connection.";
-	    failedObjs = this.props.addedObjsCollection.getFailedObjs();
-	    message = React.createElement("ul", null, _.map(failedObjs, function(obj) {
+	    message = React.createElement("ul", null, _.map(this.props.failedAdditions, function(obj) {
 	      return React.createElement("div", {
 	        "className": "content-browser-alert"
-	      }, React.createElement("h4", null, obj.fileName()), React.createElement("li", null, obj.failureMessage() || defaultError));
+	      }, React.createElement("h4", null, obj.filename), React.createElement("li", null, obj.failureMessage || defaultError));
 	    }));
 	    return message;
 	  },
@@ -24167,9 +23877,7 @@
 	    });
 	  },
 	  getErrorsCount: function() {
-	    var failedObjs;
-	    failedObjs = this.props.addedObjsCollection.getFailedObjs();
-	    return "" + failedObjs.length + " Error(s)";
+	    return "" + this.props.failedAdditions.length + " Error(s)";
 	  },
 	  _titleInfo: function() {
 	    return "Display full upload error message";
@@ -24181,18 +23889,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 232 */
+/* 228 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedTableViewItem;
 
-	LastAddedItemMixin = __webpack_require__(233);
+	LastAddedItemMixin = __webpack_require__(229);
 
 	LastAddedTableViewItem = React.createClass({
 	  displayName: 'LastAddedTableViewItem',
 	  mixins: [LastAddedItemMixin],
 	  getUploadTitle: function() {
-	    return "uploading file " + (this.props.addedItem.fileName()) + " ...";
+	    return "uploading file " + this.props.addedItem.filename + " ...";
 	  },
 	  render: function() {
 	    return React.createElement("tr", null, React.createElement("td", {
@@ -24211,21 +23919,23 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 233 */
+/* 229 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin;
+	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, isActive;
+
+	isActive = __webpack_require__(230).isActive;
 
 	LastAddedItemMixin = {
 	  uploadInProgress: function() {
-	    return this.props.addedItem.status() === "active";
+	    return isActive(this.props.addedItem);
 	  },
 	  renderUploadStateProgress: function() {
 	    if (this.uploadInProgress()) {
 	      return React.createElement("div", {
 	        "className": "upload_state",
 	        "style": {
-	          width: "" + (this.props.addedItem.progress()) + "%"
+	          width: "" + this.props.addedItem.progress + "%"
 	        }
 	      });
 	    }
@@ -24237,12 +23947,53 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 234 */
+/* 230 */
+/***/ function(module, exports) {
+
+	var failed, isActive, isCompleted, isFailed, status;
+
+	status = function(addition) {
+	  if (addition.progress === 0) {
+	    return "failed";
+	  } else if (addition.progress === 100) {
+	    return "completed";
+	  } else {
+	    return "active";
+	  }
+	};
+
+	isActive = function(addition) {
+	  return status(addition) === "active";
+	};
+
+	isCompleted = function(addition) {
+	  return status(addition) === "completed";
+	};
+
+	isFailed = function(addition) {
+	  return status(addition) === "failed";
+	};
+
+	failed = function(additions) {
+	  return _.filter(additions, isFailed);
+	};
+
+	module.exports = {
+	  status: status,
+	  failed: failed,
+	  isActive: isActive,
+	  isCompleted: isCompleted,
+	  isFailed: isFailed
+	};
+
+
+/***/ },
+/* 231 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, TableViewItem;
 
-	InspectedItemMixin = __webpack_require__(222);
+	InspectedItemMixin = __webpack_require__(218);
 
 	TableViewItem = React.createClass({
 	  displayName: 'TableViewItem',
@@ -24286,23 +24037,29 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 235 */
+/* 232 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedThumbnailErrorItem, LastAddedThumbnailItem, LastAddedThumbnailItems, ThumbnailItem;
+	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedThumbnailErrorItem, LastAddedThumbnailItem, LastAddedThumbnailItems, Obj, ThumbnailItem, failed, isActive, isCompleted, _ref;
 
-	LastAddedThumbnailErrorItem = __webpack_require__(236);
+	LastAddedThumbnailErrorItem = __webpack_require__(233);
 
-	LastAddedThumbnailItem = __webpack_require__(237);
+	LastAddedThumbnailItem = __webpack_require__(234);
 
-	ThumbnailItem = __webpack_require__(221);
+	ThumbnailItem = __webpack_require__(217);
+
+	Obj = __webpack_require__(170);
+
+	_ref = __webpack_require__(230), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
 
 	LastAddedThumbnailItems = React.createClass({
 	  displayName: "LastAddedThumbnailItems",
 	  renderedLastAddedErrorThumbComponent: function() {
-	    if (this.props.addedObjsCollection.hasFailedCreations()) {
+	    var failedAdditions;
+	    failedAdditions = failed(this.props.additions);
+	    if (failedAdditions.length) {
 	      return React.createElement(LastAddedThumbnailErrorItem, {
-	        "addedObjsCollection": this.props.addedObjsCollection
+	        "failedAdditions": failedAdditions
 	      });
 	    }
 	  },
@@ -24310,17 +24067,19 @@
 	    return "items scrivito-content-browser-thumbnails small";
 	  },
 	  buildItems: function() {
-	    return _.map(this.props.addedObjsCollection.objs(), (function(_this) {
-	      return function(obj) {
-	        if (obj.status() === "active") {
+	    return _.map(this.props.additions, (function(_this) {
+	      return function(addition) {
+	        var obj;
+	        if (isActive(addition)) {
 	          return React.createElement(LastAddedThumbnailItem, {
-	            "key": obj.uniqueId(),
-	            "addedItem": obj
+	            "key": addition.additionId,
+	            "addedItem": addition
 	          });
-	        } else if (obj.status() === "completed") {
+	        } else if (isCompleted(addition)) {
+	          obj = new Obj(addition.obj);
 	          return React.createElement(ThumbnailItem, {
-	            "key": obj.createdObj().id(),
-	            "obj": obj.createdObj(),
+	            "key": obj.id(),
+	            "obj": obj,
 	            "objCollection": _this.props.objCollection
 	          });
 	        }
@@ -24339,12 +24098,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 236 */
+/* 233 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedThumbnailErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(231);
+	LastAddedErrorItemMixin = __webpack_require__(227);
 
 	LastAddedThumbnailErrorItem = React.createClass({
 	  displayName: 'LastAddedThumbnailErrorItem',
@@ -24369,12 +24128,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 237 */
+/* 234 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedThumbnailItem;
 
-	LastAddedItemMixin = __webpack_require__(233);
+	LastAddedItemMixin = __webpack_require__(229);
 
 	LastAddedThumbnailItem = React.createClass({
 	  displayName: 'LastAddedThumbnailItem',
@@ -24396,7 +24155,7 @@
 	      "className": "scrivito-content-browser-preview"
 	    }), React.createElement("span", {
 	      "className": "scrivito-content-browser-thumbnails-name"
-	    }, this.props.addedItem.fileName())));
+	    }, this.props.addedItem.filename)));
 	  }
 	});
 
@@ -24405,18 +24164,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 238 */
+/* 235 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InfiniteScrollMixin, ObjCreation, ReactDOM, TableViewAddItem, TableViewContent, TableViewItem;
 
-	TableViewItem = __webpack_require__(234);
+	TableViewItem = __webpack_require__(231);
 
-	TableViewAddItem = __webpack_require__(239);
+	TableViewAddItem = __webpack_require__(236);
 
-	ObjCreation = __webpack_require__(226);
+	ObjCreation = __webpack_require__(222);
 
-	InfiniteScrollMixin = __webpack_require__(220);
+	InfiniteScrollMixin = __webpack_require__(216);
 
 	ReactDOM = __webpack_require__(153);
 
@@ -24444,8 +24203,14 @@
 	    return React.createElement("div", {
 	      "className": "scrivito-content-browser-list-content"
 	    }, React.createElement("table", null, React.createElement("tbody", null, (this.objCreation().showCreationItem() ? React.createElement(TableViewAddItem, {
+	      "activeTags": this.props.activeTags,
 	      "objCreation": this.objCreation(),
-	      "addedObjsCollection": this.props.addedObjsCollection
+	      "basePreset": true,
+	      "props": true,
+	      "ps": true,
+	      "basePreset": true,
+	      "t": true,
+	      "createObj": this.props.createObj
 	    }) : void 0), this.getTableViewItems())));
 	  }
 	});
@@ -24455,12 +24220,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 239 */
+/* 236 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, TableViewAddItem;
 
-	AddItemMixin = __webpack_require__(225);
+	AddItemMixin = __webpack_require__(221);
 
 	TableViewAddItem = React.createClass({
 	  mixins: [AddItemMixin],
@@ -24485,7 +24250,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 240 */
+/* 237 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var TagBar;
@@ -24536,7 +24301,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 241 */
+/* 238 */
 /***/ function(module, exports) {
 
 	var TagsActionCreator;
@@ -24576,7 +24341,7 @@
 	  TagsActionCreator.toggleTag = function(tag, filter) {
 	    return function(dispatch, getState) {
 	      dispatch(TagsActionCreator._startToggleTag(tag));
-	      return filter.trigger("tagActiveStateChanged", filter);
+	      return filter.trigger("reduxStateChanged", filter);
 	    };
 	  };
 
@@ -24612,7 +24377,7 @@
 
 
 /***/ },
-/* 242 */
+/* 239 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var MoreItemsSpinner;
@@ -24633,18 +24398,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 243 */
+/* 240 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, InspectorAction, MaximizeInspectorToggle, ModalDialogsModule, ReactRedux;
 
-	ModalDialogsModule = __webpack_require__(244);
+	ModalDialogsModule = __webpack_require__(241);
 
-	MaximizeInspectorToggle = __webpack_require__(245);
+	MaximizeInspectorToggle = __webpack_require__(242);
 
-	InspectorAction = __webpack_require__(246);
+	InspectorAction = __webpack_require__(243);
 
-	ReactRedux = __webpack_require__(182);
+	ReactRedux = __webpack_require__(178);
 
 	Inspector = React.createClass({
 	  displayName: 'Inspector',
@@ -24712,7 +24477,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 244 */
+/* 241 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ModalDialogsModule;
@@ -24739,7 +24504,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 245 */
+/* 242 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var MaximizeInspectorToggle;
@@ -24765,7 +24530,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 246 */
+/* 243 */
 /***/ function(module, exports) {
 
 	var InspectorActionCreator;
@@ -24789,12 +24554,12 @@
 
 
 /***/ },
-/* 247 */
+/* 244 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Footer, ModalDialogsModule;
 
-	ModalDialogsModule = __webpack_require__(244);
+	ModalDialogsModule = __webpack_require__(241);
 
 	Footer = React.createClass({
 	  displayName: 'Footer',
@@ -24861,7 +24626,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 248 */
+/* 245 */
 /***/ function(module, exports) {
 
 	var LastAddedActionCreator;
@@ -24886,16 +24651,176 @@
 
 
 /***/ },
-/* 249 */
+/* 246 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var CREATE_OBJ_FAILED, CREATE_OBJ_FINISH, CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_START, DELETE_OBJ_FINISH, Fetcher, createObj, objDeleted, _createObjFailed, _createObjFinish, _createObjProgressUpdate, _createObjStart, _getTagsAttributes, _hasCorrectTagAttribute;
+
+	Fetcher = __webpack_require__(247);
+
+	CREATE_OBJ_START = 'CREATE_OBJ_START';
+
+	CREATE_OBJ_FINISH = 'CREATE_OBJ_FINISH';
+
+	CREATE_OBJ_PROGRESS_UPDATE = 'CREATE_OBJ_PROGRESS_UPDATE';
+
+	CREATE_OBJ_FAILED = 'CREATE_OBJ_FAILED';
+
+	DELETE_OBJ_FINISH = 'DELETE_OBJ_FINISH';
+
+	_createObjStart = function(additionId, filename) {
+	  return {
+	    type: CREATE_OBJ_START,
+	    additionId: additionId,
+	    filename: filename,
+	    progress: 10
+	  };
+	};
+
+	_createObjProgressUpdate = function(additionId, progress) {
+	  return {
+	    type: CREATE_OBJ_PROGRESS_UPDATE,
+	    additionId: additionId,
+	    progress: progress
+	  };
+	};
+
+	_createObjFinish = function(additionId, obj) {
+	  return {
+	    type: CREATE_OBJ_FINISH,
+	    additionId: additionId,
+	    obj: obj
+	  };
+	};
+
+	_createObjFailed = function(additionId, message) {
+	  return {
+	    type: CREATE_OBJ_FAILED,
+	    additionId: additionId,
+	    message: message
+	  };
+	};
+
+	_hasCorrectTagAttribute = function(objClass) {
+	  var _ref;
+	  return (objClass != null ? (_ref = objClass.attribute('tags')) != null ? _ref.type : void 0 : void 0) === 'stringlist';
+	};
+
+	_getTagsAttributes = function(objClassName, activeTags) {
+	  var objClass;
+	  objClass = scrivito.ObjClass.find(objClassName);
+	  if (activeTags.length > 0 && _hasCorrectTagAttribute(objClass)) {
+	    return {
+	      tags: activeTags
+	    };
+	  }
+	};
+
+	objDeleted = function(objId) {
+	  return {
+	    type: DELETE_OBJ_FINISH,
+	    objId: objId
+	  };
+	};
+
+	createObj = function(attributes, basePreset, preset, activeTags) {
+	  if (attributes == null) {
+	    attributes = {};
+	  }
+	  if (basePreset == null) {
+	    basePreset = {};
+	  }
+	  if (preset == null) {
+	    preset = {};
+	  }
+	  if (activeTags == null) {
+	    activeTags = [];
+	  }
+	  return function(dispatch) {
+	    var additionId, filename, objClassName, tags, _ref;
+	    additionId = _.uniqueId('addition');
+	    objClassName = attributes._obj_class || preset._obj_class || basePreset._obj_class;
+	    tags = _getTagsAttributes(objClassName, activeTags) || {};
+	    attributes = _.extend({}, basePreset, tags, preset, attributes);
+	    filename = (_ref = attributes.blob) != null ? _ref.name : void 0;
+	    dispatch(_createObjStart(additionId, filename));
+	    return scrivito.create_obj(attributes).then(function(_arg) {
+	      var id;
+	      id = _arg.id;
+	      dispatch(_createObjProgressUpdate(additionId, 50));
+	      return Fetcher.fetchObjData(id);
+	    }).then(function(obj) {
+	      return dispatch(_createObjFinish(additionId, obj));
+	    }).fail(function(error) {
+	      return dispatch(_createObjFailed(additionId, error != null ? error.message : void 0));
+	    });
+	  };
+	};
+
+	module.exports = {
+	  CREATE_OBJ_START: CREATE_OBJ_START,
+	  CREATE_OBJ_FINISH: CREATE_OBJ_FINISH,
+	  CREATE_OBJ_PROGRESS_UPDATE: CREATE_OBJ_PROGRESS_UPDATE,
+	  CREATE_OBJ_FAILED: CREATE_OBJ_FAILED,
+	  DELETE_OBJ_FINISH: DELETE_OBJ_FINISH,
+	  _createObjStart: _createObjStart,
+	  _createObjFinish: _createObjFinish,
+	  _createObjProgressUpdate: _createObjProgressUpdate,
+	  _createObjFailed: _createObjFailed,
+	  createObj: createObj,
+	  objDeleted: objDeleted
+	};
+
+
+/***/ },
+/* 247 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var QueryBuilder, fetchObjData;
+
+	QueryBuilder = __webpack_require__(172);
+
+	fetchObjData = function(id, retryCount, promise) {
+	  if (retryCount == null) {
+	    retryCount = 0;
+	  }
+	  if (promise == null) {
+	    promise = $.Deferred();
+	  }
+	  QueryBuilder.byId(id).load_batch().done(function(searchResult) {
+	    if (searchResult.hits.length) {
+	      return promise.resolve(searchResult.hits[0]);
+	    } else {
+	      if (retryCount < 2) {
+	        return window.setTimeout((function() {
+	          return fetchObjData(id, retryCount + 1, promise);
+	        }), 500);
+	      } else {
+	        return promise.reject();
+	      }
+	    }
+	  }).fail(function() {
+	    return promise.reject();
+	  });
+	  return promise;
+	};
+
+	module.exports = {
+	  fetchObjData: fetchObjData
+	};
+
+
+/***/ },
+/* 248 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var applyMiddleware, combinedReducer, configureStore, createStore, thunkMiddleware, _ref;
 
-	thunkMiddleware = __webpack_require__(250);
+	thunkMiddleware = __webpack_require__(249);
 
-	_ref = __webpack_require__(190), createStore = _ref.createStore, applyMiddleware = _ref.applyMiddleware;
+	_ref = __webpack_require__(186), createStore = _ref.createStore, applyMiddleware = _ref.applyMiddleware;
 
-	combinedReducer = __webpack_require__(251);
+	combinedReducer = __webpack_require__(250);
 
 	configureStore = function(initialState) {
 	  var createStoreWithMiddleware;
@@ -24907,7 +24832,7 @@
 
 
 /***/ },
-/* 250 */
+/* 249 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -24926,25 +24851,28 @@
 	module.exports = thunkMiddleware;
 
 /***/ },
-/* 251 */
+/* 250 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var Redux, TagsReducer, combinedReducer, inspectorReducer, lastAddedReducer, objDisplayReducer;
+	var Redux, TagsReducer, combinedReducer, inspectorReducer, lastAddedReducer, objDisplayReducer, sortCriteria;
+
+	Redux = __webpack_require__(186);
 
-	Redux = __webpack_require__(190);
+	inspectorReducer = __webpack_require__(251);
 
-	inspectorReducer = __webpack_require__(252);
+	lastAddedReducer = __webpack_require__(252);
 
-	lastAddedReducer = __webpack_require__(253);
+	objDisplayReducer = __webpack_require__(255);
 
-	objDisplayReducer = __webpack_require__(254);
+	sortCriteria = __webpack_require__(256);
 
-	TagsReducer = __webpack_require__(255);
+	TagsReducer = __webpack_require__(257);
 
 	combinedReducer = Redux.combineReducers({
 	  objDisplay: objDisplayReducer,
 	  inspector: inspectorReducer,
 	  lastAdded: lastAddedReducer,
+	  sortCriteria: sortCriteria,
 	  tags: TagsReducer
 	});
 
@@ -24952,12 +24880,12 @@
 
 
 /***/ },
-/* 252 */
+/* 251 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var inspectorActions, inspectorReducer;
 
-	inspectorActions = __webpack_require__(246);
+	inspectorActions = __webpack_require__(243);
 
 	inspectorReducer = function(state, action) {
 	  if (state == null) {
@@ -24979,17 +24907,55 @@
 
 
 /***/ },
-/* 253 */
+/* 252 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var LAST_ADDED_TOOGLE, LastAddedReducer;
+	var CREATE_OBJ_FAILED, CREATE_OBJ_FINISH, CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_START, DELETE_OBJ_FINISH, LAST_ADDED_TOOGLE, LastAddedReducer, deleteAdition, update, updateAddition, _ref;
+
+	LAST_ADDED_TOOGLE = __webpack_require__(245).LAST_ADDED_TOOGLE;
+
+	_ref = __webpack_require__(246), CREATE_OBJ_START = _ref.CREATE_OBJ_START, CREATE_OBJ_PROGRESS_UPDATE = _ref.CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_FINISH = _ref.CREATE_OBJ_FINISH, CREATE_OBJ_FAILED = _ref.CREATE_OBJ_FAILED, DELETE_OBJ_FINISH = _ref.DELETE_OBJ_FINISH;
+
+	update = __webpack_require__(253);
+
+	deleteAdition = function(state, objId) {
+	  var addedObjIndex;
+	  addedObjIndex = _.findIndex(state.additions, function(addedObj) {
+	    return addedObj.progress === 100 && addedObj.obj.id === objId;
+	  });
+	  if (addedObjIndex > -1) {
+	    return update(state, {
+	      additions: {
+	        $splice: [[addedObjIndex, 1]]
+	      }
+	    });
+	  } else {
+	    return state;
+	  }
+	};
 
-	LAST_ADDED_TOOGLE = __webpack_require__(248).LAST_ADDED_TOOGLE;
+	updateAddition = function(state, id, newProps) {
+	  var addition, index;
+	  index = _.findIndex(state.additions, {
+	    additionId: id
+	  });
+	  addition = state.additions[index];
+	  addition = update(addition, {
+	    $merge: newProps
+	  });
+	  return update(state, {
+	    additions: {
+	      $splice: [[index, 1, addition]]
+	    }
+	  });
+	};
 
 	LastAddedReducer = function(state, action) {
+	  var addition;
 	  if (state == null) {
 	    state = {
-	      isVisible: false
+	      isVisible: false,
+	      additions: []
 	    };
 	  }
 	  switch (action.type) {
@@ -24997,6 +24963,34 @@
 	      return _.extend({}, state, {
 	        isVisible: action.isVisible
 	      });
+	    case CREATE_OBJ_START:
+	      addition = _.omit(action, 'type');
+	      return update(state, {
+	        additions: {
+	          $unshift: [addition]
+	        }
+	      });
+	    case CREATE_OBJ_PROGRESS_UPDATE:
+	      return updateAddition(state, action.additionId, {
+	        progress: action.progress
+	      });
+	    case CREATE_OBJ_FINISH:
+	      state = updateAddition(state, action.additionId, {
+	        obj: action.obj,
+	        progress: 100
+	      });
+	      return update(state, {
+	        lastAddedObj: {
+	          $set: action.obj
+	        }
+	      });
+	    case CREATE_OBJ_FAILED:
+	      return updateAddition(state, action.additionId, {
+	        failureMessage: action.message,
+	        progress: 0
+	      });
+	    case DELETE_OBJ_FINISH:
+	      return deleteAdition(state, action.objId);
 	    default:
 	      return state;
 	  }
@@ -25005,13 +24999,131 @@
 	module.exports = LastAddedReducer;
 
 
+/***/ },
+/* 253 */
+/***/ function(module, exports, __webpack_require__) {
+
+	module.exports = __webpack_require__(254);
+
 /***/ },
 /* 254 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Copyright 2013-2015, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 *
+	 * @providesModule update
+	 */
+
+	/* global hasOwnProperty:true */
+
+	'use strict';
+
+	var assign = __webpack_require__(38);
+	var keyOf = __webpack_require__(78);
+	var invariant = __webpack_require__(12);
+	var hasOwnProperty = ({}).hasOwnProperty;
+
+	function shallowCopy(x) {
+	  if (Array.isArray(x)) {
+	    return x.concat();
+	  } else if (x && typeof x === 'object') {
+	    return assign(new x.constructor(), x);
+	  } else {
+	    return x;
+	  }
+	}
+
+	var COMMAND_PUSH = keyOf({ $push: null });
+	var COMMAND_UNSHIFT = keyOf({ $unshift: null });
+	var COMMAND_SPLICE = keyOf({ $splice: null });
+	var COMMAND_SET = keyOf({ $set: null });
+	var COMMAND_MERGE = keyOf({ $merge: null });
+	var COMMAND_APPLY = keyOf({ $apply: null });
+
+	var ALL_COMMANDS_LIST = [COMMAND_PUSH, COMMAND_UNSHIFT, COMMAND_SPLICE, COMMAND_SET, COMMAND_MERGE, COMMAND_APPLY];
+
+	var ALL_COMMANDS_SET = {};
+
+	ALL_COMMANDS_LIST.forEach(function (command) {
+	  ALL_COMMANDS_SET[command] = true;
+	});
+
+	function invariantArrayCase(value, spec, command) {
+	  !Array.isArray(value) ?  false ? invariant(false, 'update(): expected target of %s to be an array; got %s.', command, value) : invariant(false) : undefined;
+	  var specValue = spec[command];
+	  !Array.isArray(specValue) ?  false ? invariant(false, 'update(): expected spec of %s to be an array; got %s. ' + 'Did you forget to wrap your parameter in an array?', command, specValue) : invariant(false) : undefined;
+	}
+
+	function update(value, spec) {
+	  !(typeof spec === 'object') ?  false ? invariant(false, 'update(): You provided a key path to update() that did not contain one ' + 'of %s. Did you forget to include {%s: ...}?', ALL_COMMANDS_LIST.join(', '), COMMAND_SET) : invariant(false) : undefined;
+
+	  if (hasOwnProperty.call(spec, COMMAND_SET)) {
+	    !(Object.keys(spec).length === 1) ?  false ? invariant(false, 'Cannot have more than one key in an object with %s', COMMAND_SET) : invariant(false) : undefined;
+
+	    return spec[COMMAND_SET];
+	  }
+
+	  var nextValue = shallowCopy(value);
+
+	  if (hasOwnProperty.call(spec, COMMAND_MERGE)) {
+	    var mergeObj = spec[COMMAND_MERGE];
+	    !(mergeObj && typeof mergeObj === 'object') ?  false ? invariant(false, 'update(): %s expects a spec of type \'object\'; got %s', COMMAND_MERGE, mergeObj) : invariant(false) : undefined;
+	    !(nextValue && typeof nextValue === 'object') ?  false ? invariant(false, 'update(): %s expects a target of type \'object\'; got %s', COMMAND_MERGE, nextValue) : invariant(false) : undefined;
+	    assign(nextValue, spec[COMMAND_MERGE]);
+	  }
+
+	  if (hasOwnProperty.call(spec, COMMAND_PUSH)) {
+	    invariantArrayCase(value, spec, COMMAND_PUSH);
+	    spec[COMMAND_PUSH].forEach(function (item) {
+	      nextValue.push(item);
+	    });
+	  }
+
+	  if (hasOwnProperty.call(spec, COMMAND_UNSHIFT)) {
+	    invariantArrayCase(value, spec, COMMAND_UNSHIFT);
+	    spec[COMMAND_UNSHIFT].forEach(function (item) {
+	      nextValue.unshift(item);
+	    });
+	  }
+
+	  if (hasOwnProperty.call(spec, COMMAND_SPLICE)) {
+	    !Array.isArray(value) ?  false ? invariant(false, 'Expected %s target to be an array; got %s', COMMAND_SPLICE, value) : invariant(false) : undefined;
+	    !Array.isArray(spec[COMMAND_SPLICE]) ?  false ? invariant(false, 'update(): expected spec of %s to be an array of arrays; got %s. ' + 'Did you forget to wrap your parameters in an array?', COMMAND_SPLICE, spec[COMMAND_SPLICE]) : invariant(false) : undefined;
+	    spec[COMMAND_SPLICE].forEach(function (args) {
+	      !Array.isArray(args) ?  false ? invariant(false, 'update(): expected spec of %s to be an array of arrays; got %s. ' + 'Did you forget to wrap your parameters in an array?', COMMAND_SPLICE, spec[COMMAND_SPLICE]) : invariant(false) : undefined;
+	      nextValue.splice.apply(nextValue, args);
+	    });
+	  }
+
+	  if (hasOwnProperty.call(spec, COMMAND_APPLY)) {
+	    !(typeof spec[COMMAND_APPLY] === 'function') ?  false ? invariant(false, 'update(): expected spec of %s to be a function; got %s.', COMMAND_APPLY, spec[COMMAND_APPLY]) : invariant(false) : undefined;
+	    nextValue = spec[COMMAND_APPLY](nextValue);
+	  }
+
+	  for (var k in spec) {
+	    if (!(ALL_COMMANDS_SET.hasOwnProperty(k) && ALL_COMMANDS_SET[k])) {
+	      nextValue[k] = update(value[k], spec[k]);
+	    }
+	  }
+
+	  return nextValue;
+	}
+
+	module.exports = update;
+
+/***/ },
+/* 255 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var SET_VIEW_MODE, THUMBNAIL_VIEW, objDisplayReducer, _ref;
 
-	_ref = __webpack_require__(202), THUMBNAIL_VIEW = _ref.THUMBNAIL_VIEW, SET_VIEW_MODE = _ref.SET_VIEW_MODE;
+	_ref = __webpack_require__(198), THUMBNAIL_VIEW = _ref.THUMBNAIL_VIEW, SET_VIEW_MODE = _ref.SET_VIEW_MODE;
 
 	objDisplayReducer = function(state, action) {
 	  if (state == null) {
@@ -25033,12 +25145,41 @@
 
 
 /***/ },
-/* 255 */
+/* 256 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var CHANGE_SORT_ORDER, DESC_SORT_ORDER, sortCriteriaReducer, _ref;
+
+	_ref = __webpack_require__(166), CHANGE_SORT_ORDER = _ref.CHANGE_SORT_ORDER, DESC_SORT_ORDER = _ref.DESC_SORT_ORDER;
+
+	sortCriteriaReducer = function(state, action) {
+	  if (state == null) {
+	    state = {
+	      sortField: '_last_changed',
+	      sortDirection: DESC_SORT_ORDER
+	    };
+	  }
+	  switch (action.type) {
+	    case CHANGE_SORT_ORDER:
+	      return {
+	        sortField: action.criteriaType,
+	        sortDirection: action.sortDirection
+	      };
+	    default:
+	      return state;
+	  }
+	};
+
+	module.exports = sortCriteriaReducer;
+
+
+/***/ },
+/* 257 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var COMPLETE_FETCHING_TAGS, DISABLE_TAGS, EXPAND_TOGGLE, START_FETCHING_TAGS, TOGGLE_TAG, TagsReducer, defaultState, getActiveTags, _ref;
 
-	_ref = __webpack_require__(241), START_FETCHING_TAGS = _ref.START_FETCHING_TAGS, EXPAND_TOGGLE = _ref.EXPAND_TOGGLE, TOGGLE_TAG = _ref.TOGGLE_TAG, COMPLETE_FETCHING_TAGS = _ref.COMPLETE_FETCHING_TAGS, DISABLE_TAGS = _ref.DISABLE_TAGS;
+	_ref = __webpack_require__(238), START_FETCHING_TAGS = _ref.START_FETCHING_TAGS, EXPAND_TOGGLE = _ref.EXPAND_TOGGLE, TOGGLE_TAG = _ref.TOGGLE_TAG, COMPLETE_FETCHING_TAGS = _ref.COMPLETE_FETCHING_TAGS, DISABLE_TAGS = _ref.DISABLE_TAGS;
 
 	getActiveTags = function(currentActiveTags, actionTag) {
 	  var activeTags;