Fix "strange" search issue. Closes #42.