diff --git a/UI/Component/Tab.js b/UI/Component/Tab.js
index a852410..07576f1 100644
--- a/UI/Component/Tab.js
+++ b/UI/Component/Tab.js
@@ -65,7 +65,7 @@ export class Tab
         for (let i = 0; i < length; ++i) {
             nodes[i].addEventListener('click', function (evt)
             {
-                let fragmentString = window.location.href.includes('#') ? HttpUri.parseUrl(window.location.href).fragment : '';
+                let fragmentString = this.querySelector('label').getAttribute('for');
 
                 /* Change Tab */
                 /* Remove selected tab */
@@ -87,9 +87,10 @@ export class Tab
                 let fragments = fragmentString.split('&');
                 const index   = fragments.indexOf(this.getElementsByTagName('label')[0].getAttribute('for'));
 
+                /**
                 if (index > -1) {
                     fragments.splice(index, 1);
-                }
+                }*/
 
                 // find old active and remove it
                 fragmentString = fragments.join('&');
@@ -99,7 +100,7 @@ export class Tab
                 /* Add selected tab */
                 window.history.replaceState(null, '',
                     UriFactory.build(
-                        '{%}#' + (fragmentString === '' ? '' : fragmentString + '&') + this.getElementsByTagName('label')[0].getAttribute('for')
+                        '{%}#' + (fragmentString === '' ? '' : fragmentString)
                     )
                 );
             });
diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index c47c805..fe85a84 100644
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -128,13 +128,12 @@ export class UriFactory
     {
         // @todo: there is a bug for uris which have a parameter without a value and a fragment e.g. ?debug#something.
         // The fragment is ignored in such a case.
-        if (url.includes('?')) {
-            const parsed = HttpUri.parseUrl(url);
+        const parsed = HttpUri.parseUrl(url);
+        const pars = [];
 
+        if (url.includes('?')) {
             // unique queries
-            const parts = typeof parsed.query === 'undefined' ? [] : parsed.query.replace(/\?/g, '&').split('&'),
-                full    = url.split('?')[0],
-                pars    = [];
+            const parts = typeof parsed.query === 'undefined' ? [] : parsed.query.replace(/\?/g, '&').split('&');
 
             let comps  = {},
                 spl    = null,
@@ -152,20 +151,18 @@ export class UriFactory
                     pars.push(a);
                 }
             }
-
-            url = full + '?' + pars.join('&');
         }
 
-        // unique fragments
-        const fragments = url.match(/\#[a-zA-Z0-9\-,]+/g),
-            fragLength  = fragments !== null ? fragments.length : 0;
+        const fragments = typeof parsed.fragment !== 'undefined' ? parsed.fragment.split('#') : null;
 
-        // @todo: don't remove fragments, some might be used = none tab fragments
-
-        for (let i = 0; i < fragLength - 1; ++i) {
-            // remove all from old url
-            url = url.replace(fragments[i], '');
-        }
+        url = (typeof parsed.scheme !== 'undefined' ? parsed.scheme + '://' : '')
+            + (typeof parsed.username !== 'undefined' ? parsed.username + ':' : '')
+            + (typeof parsed.password !== 'undefined' ? parsed.password + '@' : '')
+            + (typeof parsed.host !== 'undefined' ? parsed.host : '')
+            + (typeof parsed.port !== 'undefined' ? parsed.port : '')
+            + (typeof parsed.path !== 'undefined' ? parsed.path : '')
+            + (typeof parsed.query !== 'undefined' ? '?' + pars.join('&') : '')
+            + (typeof parsed.fragment !== 'undefined' ? '#' + fragments[fragments.length - 1] : '');
 
         return url;
     };