Horrible search render performance now fixed