Fixed long loading times for * search