Added clearing of indices when loading.
Updated includes.