Fixed searching
Closes #18