fixed save & search