Give the test as much time for indexing as it got for inserting
Don't output NULL_VALUE for fields mark with numeric sorting
Properly move the indexes on restore to the expected location
Restore the folder icon
Making sure that we use the proper path when restoring a relative path database
Fixing wrong value saved on conflict