Fixing search in Issue #29