Fix search on older devices