[FIX] Index may not be less than 0

In some cases its -1 when moving folders or files around in the file
system and that causes an unwanted exception. This is maybe a dirty fix.
Merge remote-tracking branch 'origin/hotfix-content-list' into tonimontana-modifications