Fixed bug that broke search after recent commit