 		@current = entity
 
 		if entity
-			@_setCurrentPage(entity._page)
+			page = entity._page
+			@_setCurrentPage(page)
+			if page[page.hotIndex] isnt entity
+				page.hotIndex = page.indexOf(entity)
 			entity._onPathChange()
 
 		@_notify(cola.constants.MESSAGE_CURRENT_CHANGE, {

				entity: entity
			})

		@setCurrent(newCurrent) if changeCurrent
		return entity

	empty: ()->


		array = []
		page = @_first
		while page
			for entity in page
				if deleted or entity.state isnt _Entity.STATE_DELETED
					array.push(entity.toJSON(options))
			page = page._next
		return array

	toArray: ()->
		array = []
		page = @_first
		while page
			for entity in page
				if entity.state isnt _Entity.STATE_DELETED
					array.push(entity)
			page = page._next
		return array

	filter: (criteria, option)->
