Improve search heuristic