Partially working stateful tag navigation
Merge branch 'window-location'