Simplified search fix from previous commit. Closes #132