BugFix: Fixed multiple search bugs