diff --git a/dist/switcheroo.min.js b/dist/switcheroo.min.js
index 6f26251..862eaa5 100644
--- a/dist/switcheroo.min.js
+++ b/dist/switcheroo.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.switcheroo=t(require("react")):e.switcheroo=t(e.React)}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";t.Switcher=n(4),t.Switch=n(3)},function(t,n,o){t.exports=e},function(e,t,n){"use strict";var o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},r=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),i=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},a=n(1),u=function(e){function t(){o(this,t),null!=e&&e.apply(this,arguments)}return i(t,e),r(t,[{key:"render",value:function(){return!1}}]),t}(a.Component);e.exports=u},function(e,t,n){"use strict";var o=function(e){return e&&e.__esModule?e["default"]:e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},i=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),a=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},u=n(1),s=o(u),p=function(e){function t(){r(this,t),null!=e&&e.apply(this,arguments)}return a(t,e),i(t,[{key:"componentDidMount",value:function(){"function"==typeof this.props.onShow&&this.props.onShow()}},{key:"componentWillUnmount",value:function(){"function"==typeof this.props.onHide&&this.props.onHide()}},{key:"render",value:function(){return s.createElement(this.props.handler,this.props.handlerProps)}}]),t}(u.Component);e.exports=p,p.displayName="Switch",p.propTypes={path:s.PropTypes.string.isRequired,handler:s.PropTypes.func.isRequired,handlerProps:s.PropTypes.object,onShow:s.PropTypes.func,onHide:s.PropTypes.func}},function(e,t,n){"use strict";var o=function(e){return e&&e.__esModule?e["default"]:e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},i=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),a=function f(e,t,n){var o=Object.getOwnPropertyDescriptor(e,t);if(void 0===o){var r=Object.getPrototypeOf(e);return null===r?void 0:f(r,t,n)}if("value"in o)return o.value;var i=o.get;return void 0===i?void 0:i.call(n)},u=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},s=n(1),p=o(s),c=n(2),l=o(c),h=function(e){function t(e){r(this,t),a(Object.getPrototypeOf(t.prototype),"constructor",this).call(this,e),this.getLocation=this.getLocation.bind(this),this.getHashLocation=this.getHashLocation.bind(this),this.getHistoryLocation=this.getHistoryLocation.bind(this),this.handleRouteChange=this.handleRouteChange.bind(this),this.getSwitch=this.getSwitch.bind(this),this.defaultComponent=p.createElement(this.props.defaultHandler||l,this.props.defaultHandlerProps),this.state={visibleComponent:null}}return u(t,e),i(t,[{key:"componentDidMount",value:function(){window.addEventListener("load",this.handleRouteChange),this.props.pushState?window.addEventListener("popstate",this.handleRouteChange):window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillUnmount",value:function(){window.removeEventListener("load",this.handleRouteChange),this.props.pushState?window.removeEventListener("popstate",this.handleRouteChange):window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"getLocation",value:function(){var e=this.props.pushState?this.getHistoryLocation():this.getHashLocation();return"/"!==e.charAt(0)?"/"+e:e}},{key:"getHashLocation",value:function(){return decodeURI(window.location.href.split("#")[1]||"")}},{key:"getHistoryLocation",value:function(){return decodeURI(window.location.pathname+window.location.search)}},{key:"getSwitch",value:function(e){var t=[].concat(this.props.children);return t.filter(function(t){return t.props.path===e})[0]}},{key:"handleRouteChange",value:function(e){var t=this.getLocation(),n=this.getSwitch(t);"function"==typeof this.props.onChange&&this.props.onChange(!!n,t),this.setState({visibleComponent:n})}},{key:"render",value:function(){return this.state.visibleComponent||this.defaultComponent}}]),t}(s.Component);e.exports=h,h.displayName="Switcher",h.propTypes={children:p.PropTypes.oneOfType([p.PropTypes.arrayOf(p.PropTypes.element),p.PropTypes.element]).isRequired,pushState:p.PropTypes.bool,defaultHandler:p.PropTypes.func,defaultHandlerProps:p.PropTypes.object,onChange:p.PropTypes.func},h.defaultProps={pushState:!1}}])});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.switcheroo=t(require("react")):e.switcheroo=t(e.React)}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";t.Switcher=n(4),t.Switch=n(3)},function(t,n,o){t.exports=e},function(e,t,n){"use strict";var o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},r=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),i=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},a=n(1),u=function(e){function t(){o(this,t),null!=e&&e.apply(this,arguments)}return i(t,e),r(t,[{key:"render",value:function(){return!1}}]),t}(a.Component);e.exports=u},function(e,t,n){"use strict";var o=function(e){return e&&e.__esModule?e["default"]:e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},i=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),a=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},u=n(1),s=o(u),p=function(e){function t(){r(this,t),null!=e&&e.apply(this,arguments)}return a(t,e),i(t,[{key:"componentDidMount",value:function(){"function"==typeof this.props.onShow&&this.props.onShow()}},{key:"componentWillUnmount",value:function(){"function"==typeof this.props.onHide&&this.props.onHide()}},{key:"render",value:function(){return s.createElement(this.props.handler,this.props.handlerProps)}}]),t}(u.Component);e.exports=p,p.displayName="Switch",p.propTypes={path:s.PropTypes.string.isRequired,handler:s.PropTypes.func.isRequired,handlerProps:s.PropTypes.object,onShow:s.PropTypes.func,onHide:s.PropTypes.func}},function(e,t,n){"use strict";var o=function(e){return e&&e.__esModule?e["default"]:e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},i=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,o.value&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),a=function f(e,t,n){var o=Object.getOwnPropertyDescriptor(e,t);if(void 0===o){var r=Object.getPrototypeOf(e);return null===r?void 0:f(r,t,n)}if("value"in o)return o.value;var i=o.get;return void 0===i?void 0:i.call(n)},u=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},s=n(1),p=o(s),c=n(2),l=o(c),h=function(e){function t(e){r(this,t),a(Object.getPrototypeOf(t.prototype),"constructor",this).call(this,e),this.getLocation=this.getLocation.bind(this),this.getHashLocation=this.getHashLocation.bind(this),this.getHistoryLocation=this.getHistoryLocation.bind(this),this.handleRouteChange=this.handleRouteChange.bind(this),this.getSwitch=this.getSwitch.bind(this),this.defaultComponent=p.createElement(this.props.defaultHandler||l,this.props.defaultHandlerProps),this.state={visibleComponent:null}}return u(t,e),i(t,[{key:"componentDidMount",value:function(){window.addEventListener("load",this.handleRouteChange),this.props.pushState?window.addEventListener("popstate",this.handleRouteChange):window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillUnmount",value:function(){window.removeEventListener("load",this.handleRouteChange),this.props.pushState?window.removeEventListener("popstate",this.handleRouteChange):window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"getLocation",value:function(){var e=this.props.pushState?this.getHistoryLocation():this.getHashLocation();return"/"!==e.charAt(0)?"/"+e:e}},{key:"getHashLocation",value:function(){return decodeURI(window.location.hash.slice(1).split("?")[0])}},{key:"getHistoryLocation",value:function(){return decodeURI(window.location.pathname)}},{key:"getSwitch",value:function(e){var t=[].concat(this.props.children);return t.filter(function(t){return t.props.path===e})[0]}},{key:"handleRouteChange",value:function(e){var t=this.getLocation(),n=this.getSwitch(t);"function"==typeof this.props.onChange&&this.props.onChange(!!n,t),this.setState({visibleComponent:n})}},{key:"render",value:function(){return this.state.visibleComponent||this.defaultComponent}}]),t}(s.Component);e.exports=h,h.displayName="Switcher",h.propTypes={children:p.PropTypes.oneOfType([p.PropTypes.arrayOf(p.PropTypes.element),p.PropTypes.element]).isRequired,pushState:p.PropTypes.bool,defaultHandler:p.PropTypes.func,defaultHandlerProps:p.PropTypes.object,onChange:p.PropTypes.func},h.defaultProps={pushState:!1}}])});
\ No newline at end of file
diff --git a/modules/components/Switcher.js b/modules/components/Switcher.js
index c8d137f..41d491c 100644
--- a/modules/components/Switcher.js
+++ b/modules/components/Switcher.js
@@ -49,11 +49,11 @@ export default class Switcher extends Component {
   }
 
   getHashLocation() {
-    return decodeURI(window.location.href.split('#')[1] || '');
+    return decodeURI(window.location.hash.slice(1).split('?')[0]);
   }
 
   getHistoryLocation() {
-    return decodeURI(window.location.pathname + window.location.search);
+    return decodeURI(window.location.pathname);
   }
 
   getSwitch(path) {