Resolve Search and Autosave issues