Now indexing both JSON and xlsx files when importing to make sure that the same key is not used twice with the same base.

Testing a bit more.