diff --git a/src/Umbraco.Web.UI/umbraco_client/FileUploader/js/jquery.fileUploader.js b/src/Umbraco.Web.UI/umbraco_client/FileUploader/js/jquery.fileUploader.js
index db09944029..14e78ab17c 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FileUploader/js/jquery.fileUploader.js
+++ b/src/Umbraco.Web.UI/umbraco_client/FileUploader/js/jquery.fileUploader.js
@@ -350,19 +350,30 @@
             var data = $item.data('data');
 
             self._startDummyProgress(data);
-            
+
             $form.submit();
 
             $iframe.load(function ()
             {
-                // Read content returned
-                var response = $(this).contents().find('body').html();
-
-                //TODO: Check the response
-                
-                // Stop dummy progress
-                //TODO: Set success flag based upon response?
                 self._stopDummyProgress(data, true);
+                
+                // Read content returned
+                var rawResponse;
+
+                if (this.contentDocument) {
+                    rawResponse = this.contentDocument.body.innerHTML;
+                } else {
+                    rawResponse = this.contentWindow.document.body.innerHTML;
+                }
+
+                var response = $.parseJSON(rawResponse);
+
+                if(response.success) {
+                    data.status = 'success';
+                } else {
+                    data.status = 'error';
+                    data.message = 'An error occured whilst uploading.';
+                }
 
                 self.opts.onDone(data);
 
diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
index 6c12a2fd70..75e523133b 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
@@ -41,6 +41,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
         {
             var self = this;
             
+            $.ajaxSetup({ cache: false });
             $.getJSON(self._opts.basePath + "/FolderBrowserService/GetChildren/" + self._parentId, function (data) {
                 if (data != undefined && data.length > 0) {
                     ko.mapping.fromJS(data, itemMappingOptions, self._viewModel.items);
diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs
index 79155405a6..ec26f553e0 100644
--- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs
+++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web;
 using System.Web.Script.Serialization;
 using Umbraco.Core;
 using Umbraco.Web.Media.ThumbnailProviders;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
index 09d2242bbc..f20ce88607 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
@@ -151,6 +151,9 @@ namespace umbraco.cms.presentation.developer
                 else
                     macro.GetMacro(macroID).removeFromCache();
 
+                base.speechBubble(speechBubbleIcon.save, "Macro saved", "");
+
+
                 // Check for assemblyBrowser
                 if (tempMacroType.IndexOf(".ascx") > 0)
                     assemblyBrowserUserControl.Controls.Add(
diff --git a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
index 18a1bdcb83..130144d30a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
@@ -75,10 +75,12 @@ namespace umbraco.presentation.umbracobase
                 int indexOfBase = url.ToLower().IndexOf(basedir);
                 url = url.Substring(indexOfBase);
 
-
                 if (url.ToLower().Contains(".aspx"))
                     url = url.Substring(0, url.IndexOf(".aspx"));
 
+                if (url.ToLower().Contains("?"))
+                    url = url.Substring(0, url.IndexOf("?"));
+
                 object[] urlArray = url.Split('/');
 
                 //There has to be minimum 4 parts in the url for this to work... /base/library/method/[parameter].aspx
diff --git a/src/umbraco.macroRenderings/propertyTypePicker.cs b/src/umbraco.macroRenderings/propertyTypePicker.cs
index 9fd70e63b5..31e761412a 100644
--- a/src/umbraco.macroRenderings/propertyTypePicker.cs
+++ b/src/umbraco.macroRenderings/propertyTypePicker.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Linq;
 
 namespace umbraco.macroRenderings
 {
@@ -70,7 +71,7 @@ namespace umbraco.macroRenderings
 			}
 
 			Hashtable ht = new Hashtable();
-			foreach(cms.businesslogic.propertytype.PropertyType pt in cms.businesslogic.propertytype.PropertyType.GetAll())
+			foreach(cms.businesslogic.propertytype.PropertyType pt in cms.businesslogic.propertytype.PropertyType.GetPropertyTypes().OrderBy(x => x.Name))
 			{
 				if (!ht.ContainsKey(pt.Alias)) 
 				{