     !History.emulated.pushState || @options.html4 == true 
 
   load: (url, target, render = 'template') ->    
-    History.pushState({ timestamp: (new Date().getTime()), render: render, target: target }, document.title, url )
+    @template_id = new Date().getTime() if render != 'partial'
+    History.pushState({ template_id: @template_id, render: render, target: target }, document.title, url )
 
-  reload: () ->    
-    History.replaceState({ timestamp: (new Date().getTime()), render: 'template' }, document.title, History.getState().url )
+  reload: () ->
+    History.replaceState({ template_id: @template_id, render: 'template' }, document.title, History.getState().url )
 
   _defaults: ->
     html4: true

  _assets_changed: (digest) ->
    @assets_digest? && @assets_digest != digest

  _set_title: (xhr) ->
    value = xhr.getResponseHeader('X-Wiselinks-Title')
    document.title = decodeURI(value) if value?

      History.Adapter.bind(
        window,
        "statechange"
        (event, data) ->          
          state = History.getState()
          if self._template_id_changed(state)
            self._call(state.url, null, 'template')
          else            
            self._call(state.url, state.data.target, state.data.render)        
      )
      
      $(document).on(
