Fixed and tweaked search.