Further fix to search - Issue #319