diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index a71d250..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/back-office/.DS_Store b/back-office/.DS_Store
deleted file mode 100644
index 074206a..0000000
Binary files a/back-office/.DS_Store and /dev/null differ
diff --git a/back-office/app/assets/images/.DS_Store b/back-office/app/assets/images/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/back-office/app/assets/images/.DS_Store and /dev/null differ
diff --git a/back-office/public/.DS_Store b/back-office/public/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/back-office/public/.DS_Store and /dev/null differ
diff --git a/front-api/.DS_Store b/front-api/.DS_Store
deleted file mode 100644
index 359b89e..0000000
Binary files a/front-api/.DS_Store and /dev/null differ
diff --git a/front-api/models/delivery_destination.rb b/front-api/models/delivery_destination.rb
index 5a36183..95437dc 100644
--- a/front-api/models/delivery_destination.rb
+++ b/front-api/models/delivery_destination.rb
@@ -3,8 +3,8 @@ class DeliveryDestination < ActiveRecord::Base
   belongs_to :user
 
   def self.create_from_last(anonymous_id, user_id)
-    dd = DeliveryDestination.where(user_id: user_id).order("id desc").first
-    dd ||= DeliveryDestination.where(anonymous_id_string: anonymous_id).order("id desc").first
+    dd = DeliveryDestination.where(["user_id is not null and user_id = ?", user_id]).order("id desc").first
+    dd ||= DeliveryDestination.where(["anonymous_id_string is not null and anonymous_id_string = ?", anonymous_id]).order("id desc").first
     dd ||= DeliveryDestination.new({user_id: user_id, anonymous_id_string: anonymous_id })
     attributes = dd.as_json
     attributes.delete("id")
diff --git a/front-ui/.DS_Store b/front-ui/.DS_Store
deleted file mode 100644
index 04afe53..0000000
Binary files a/front-ui/.DS_Store and /dev/null differ
diff --git a/front-ui/app/.DS_Store b/front-ui/app/.DS_Store
deleted file mode 100644
index 5750456..0000000
Binary files a/front-ui/app/.DS_Store and /dev/null differ
diff --git a/front-ui/app/components/.DS_Store b/front-ui/app/components/.DS_Store
deleted file mode 100644
index 44861fd..0000000
Binary files a/front-ui/app/components/.DS_Store and /dev/null differ
diff --git a/front-ui/app/components/items/.DS_Store b/front-ui/app/components/items/.DS_Store
deleted file mode 100644
index 1534571..0000000
Binary files a/front-ui/app/components/items/.DS_Store and /dev/null differ
diff --git a/front-ui/app/components/shared/.DS_Store b/front-ui/app/components/shared/.DS_Store
deleted file mode 100644
index 1938026..0000000
Binary files a/front-ui/app/components/shared/.DS_Store and /dev/null differ
diff --git a/front-ui/app/models/place.js b/front-ui/app/models/place.js
index 9fa24ab..0abd06b 100644
--- a/front-ui/app/models/place.js
+++ b/front-ui/app/models/place.js
@@ -12,7 +12,8 @@ var Place = Backbone.Model.extend({
     },
 
 	url: function() {
-		return Globals.ApiUrl + '/place/' + this.postalCode.trim();
+		var postalCode = this.postalCode || "00000";
+		return Globals.ApiUrl + '/place/' + postalCode.trim();
 	}
 
 });