Fixing some issues with index initial creation and avoiding to store invalid properties