Fix search in new layout