Fixed save-last-search behavior