Fix search bug
Closes #16