diff --git a/app/controllers/review_offer/items.js b/app/controllers/review_offer/items.js
index 46ab6ec4f..28ae21957 100644
--- a/app/controllers/review_offer/items.js
+++ b/app/controllers/review_offer/items.js
@@ -12,6 +12,7 @@ export default Ember.Controller.extend({
     "offer.messages.[]",
     function() {
       return this.get("offer.messages")
+        .filterBy("item", null)
         .filter(m => !m.get("isCharityConversation"))
         .sortBy("createdAt")
         .get("lastObject");
diff --git a/app/models/package_type.js.rej b/app/models/package_type.js.rej
new file mode 100644
index 000000000..cee43503d
--- /dev/null
+++ b/app/models/package_type.js.rej
@@ -0,0 +1,41 @@
+diff a/app/models/package_type.js b/app/models/package_type.js	(rejected hunks)
+@@ -1,2 +1,2 @@
+-import DS from 'ember-data';
+-import Ember from 'ember';
++import DS from "ember-data";
++import Ember from "ember";
+@@ -9,7 +9,7 @@ export default DS.Model.extend({
+-  name:                 attr('string'),
+-  otherTerms:           attr('string'),
+-  code:                 attr('string'),
+-  isItemTypeNode:       attr('boolean', {defaultValue: false}),
+-  visibleInSelects:     attr('boolean', {defaultValue: false}),
+-  defaultChildPackages: attr('string'),
+-  otherChildPackages:   attr('string'),
++  name: attr("string"),
++  otherTerms: attr("string"),
++  code: attr("string"),
++  isItemTypeNode: attr("boolean", { defaultValue: false }),
++  visibleInSelects: attr("boolean", { defaultValue: false }),
++  defaultChildPackages: attr("string"),
++  otherChildPackages: attr("string"),
+@@ -17,3 +17,3 @@ export default DS.Model.extend({
+-  location:       belongsTo('location', { async: false }),
+-  packages:       hasMany('package', { inverse: 'packageType' }),
+-  packagesCount:  Ember.computed.alias("packages.length"),
++  location: belongsTo("location", { async: false }),
++  packages: hasMany("package", { inverse: "packageType" }),
++  packagesCount: Ember.computed.alias("packages.length"),
+@@ -30 +30,3 @@ export default DS.Model.extend({
+-    return this.defaultChildPackagesList().concat(this.otherChildPackagesList());
++    return this.defaultChildPackagesList().concat(
++      this.otherChildPackagesList()
++    );
+@@ -33,2 +35,2 @@ export default DS.Model.extend({
+-  _getPackages: function(model, packageNames){
+-    var array = (packageNames || "").split(',').filter(Boolean);
++  _getPackages: function(model, packageNames) {
++    var array = (packageNames || "").split(",").filter(Boolean);
+@@ -38 +40 @@ export default DS.Model.extend({
+-      allPackageTypes.filter(function (pkg) {
++      allPackageTypes.filter(function(pkg) {