Commit for search and autosave issues