SaveSearch works

Change-Id: I31f467e219b8c7471d2ab936985b07717e439728