Fix search for real this time