diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js
index 4e12a2a2..dde5527a 100644
--- a/src/_h5ai/client/js/inc/core/location.js
+++ b/src/_h5ai/client/js/inc/core/location.js
@@ -76,10 +76,12 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
 			newAbsHref = encodedHref(newAbsHref);
 			if (absHref !== newAbsHref) {
 				absHref = newAbsHref;
-				event.pub('location.changed', getItem());
 
 				notify.set('loading...');
-				modulejs.require('core/refresh')(function () { notify.set(); });
+				modulejs.require('core/refresh')(function () {
+					notify.set();
+					event.pub('location.changed', getItem());
+				});
 
 				if (history) {
 					if (keepBrowserUrl) {
diff --git a/src/_h5ai/client/js/inc/core/refresh.js b/src/_h5ai/client/js/inc/core/refresh.js
index 0ac66bcf..912b06c4 100644
--- a/src/_h5ai/client/js/inc/core/refresh.js
+++ b/src/_h5ai/client/js/inc/core/refresh.js
@@ -1,5 +1,5 @@
 
-modulejs.define('core/refresh', ['_', 'config', 'core/server', 'model/entry', 'core/location'], function (_, config, server, Entry, location) {
+modulejs.define('core/refresh', ['_', 'core/server', 'model/entry', 'core/location'], function (_, server, Entry, location) {
 
 	var parseJson = function (entry, json) {
 
diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js
index 61e80086..d5e65f5d 100644
--- a/src/_h5ai/client/js/inc/ext/thumbnails.js
+++ b/src/_h5ai/client/js/inc/ext/thumbnails.js
@@ -27,32 +27,29 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
 
 		checkEntry = function (entry) {
 
-			if (entry.$extended) {
+			var type = null;
 
-				var type = null;
+			if (_.indexOf(settings.img, entry.type) >= 0) {
+				type = 'img';
+			} else if (_.indexOf(settings.mov, entry.type) >= 0) {
+				type = 'mov';
+			} else if (_.indexOf(settings.doc, entry.type) >= 0) {
+				type = 'doc';
+			}
 
-				if (_.indexOf(settings.img, entry.type) >= 0) {
-					type = 'img';
-				} else if (_.indexOf(settings.mov, entry.type) >= 0) {
-					type = 'mov';
-				} else if (_.indexOf(settings.doc, entry.type) >= 0) {
-					type = 'doc';
-				}
+			if (type) {
+				requestThumbSmall(type, entry.absHref, function (src) {
 
-				if (type) {
-					requestThumbSmall(type, entry.absHref, function (src) {
+					if (src && entry.$extended) {
+						entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src);
+					}
+				});
+				requestThumbBig(type, entry.absHref, function (src) {
 
-						if (src) {
-							entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src);
-						}
-					});
-					requestThumbBig(type, entry.absHref, function (src) {
-
-						if (src) {
-							entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src);
-						}
-					});
-				}
+					if (src && entry.$extended) {
+						entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src);
+					}
+				});
 			}
 		},