diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 79260ace69..dcaee2fe38 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -346,8 +346,8 @@ function entityResource($q, $http, umbRequestHelper) {
           * @param {Int} parentid id of content item to return children of
           * @param {string} type Object type name
           * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
+          * @param {Int} options.pageNumber if paging data, current page index, default = 100
           * @param {String} options.filter if provided, query will only return those with names matching the filter
           * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
           * @param {String} options.orderBy property to order items by, default: `SortOrder`
@@ -357,8 +357,8 @@ function entityResource($q, $http, umbRequestHelper) {
         getPagedChildren: function (parentId, type, options) {
 
             var defaults = {
-                pageSize: 0,
-                pageNumber: 0,
+                pageSize: 1,
+                pageNumber: 100,
                 filter: '',
                 orderDirection: "Ascending",
                 orderBy: "SortOrder"
@@ -390,7 +390,7 @@ function entityResource($q, $http, umbRequestHelper) {
                             pageSize: options.pageSize,
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
-                            filter: options.filter
+                            filter: encodeURIComponent(options.filter)
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
@@ -416,8 +416,8 @@ function entityResource($q, $http, umbRequestHelper) {
           * @param {Int} parentid id of content item to return descendants of
           * @param {string} type Object type name
           * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
+          * @param {Int} options.pageNumber if paging data, current page index, default = 100
           * @param {String} options.filter if provided, query will only return those with names matching the filter
           * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
           * @param {String} options.orderBy property to order items by, default: `SortOrder`
@@ -427,8 +427,8 @@ function entityResource($q, $http, umbRequestHelper) {
         getPagedDescendants: function (parentId, type, options) {
 
             var defaults = {
-                pageSize: 0,
-                pageNumber: 0,
+                pageSize: 1,
+                pageNumber: 100,
                 filter: '',
                 orderDirection: "Ascending",
                 orderBy: "SortOrder"
@@ -460,7 +460,7 @@ function entityResource($q, $http, umbRequestHelper) {
                             pageSize: options.pageSize,
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
-                            filter: options.filter
+                            filter: encodeURIComponent(options.filter)
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 9cb78cdff2..f6ae9a8d6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -260,22 +260,29 @@ angular.module("umbraco")
                             mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                             mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
                             // set properties to match a media object
-                            mediaItem.properties = [
-                                {
-                                    alias: "umbracoWidth",
-                                    value: mediaItem.metaData.umbracoWidth.Value
-                                },
-                                {
-                                    alias: "umbracoHeight",
-                                    value: mediaItem.metaData.umbracoHeight.Value
-                                }
-                            ];
+                            if (mediaItem.metaData &&
+                                mediaItem.metaData.umbracoWidth &&
+                                mediaItem.metaData.umbracoHeight) {
+                                
+                                mediaItem.properties = [
+                                    {
+                                        alias: "umbracoWidth",
+                                        value: mediaItem.metaData.umbracoWidth.Value
+                                    },
+                                    {
+                                        alias: "umbracoHeight",
+                                        value: mediaItem.metaData.umbracoHeight.Value
+                                    }
+                                ];
+                            }
                         });
                         // update images
                         $scope.images = data.items ? data.items : [];
                         // update pagination
-                        $scope.searchOptions.pageNumber = data.pageNumber;
-                        $scope.searchOptions.pageSize = data.pageSize;
+                        if (data.pageNumber > 0)
+                            $scope.searchOptions.pageNumber = data.pageNumber;
+                        if (data.pageSize > 0)
+                            $scope.searchOptions.pageSize = data.pageSize;
                         $scope.searchOptions.totalItems = data.totalItems;
                         $scope.searchOptions.totalPages = data.totalPages;
                         // set already selected images to selected