Fixing search #82