Add utility to fix incorrect index entries

Also modified incorrect index entries query to return raw storage keys
so they can be used directly by the new fix index command to
specifically fix that one entry.