fixing search closes #19