Fixing the save and search.