Add a few more searches for #172