last search fixes