fix search performance