Fix save search feature