Fix search persistance