Fixed #25. Custom search broken though.