Added better unindex method, bug fix on indexObjects and reindexType